Re: [PATCH] lightnvm: rename dma helper functions (UPS)

[Matias BjÃrling]

On 04/28/2016 05:47 PM, Javier GonzÃlez wrote:
> Until now, the dma pool have been exclusively used to allocate the ppa
> list being sent to the device. In pblk (upcoming), we use these pools to
> allocate metadata too. Thus, we generalize the names of some variables
> on the dma helper functions to make the code more readable.
>
> Signed-off-by: Javier GonzÃlez <javier@xxxxxxxxxxxx>
> ---
>   drivers/lightnvm/core.c      | 16 ++++++++--------
>   drivers/nvme/host/lightnvm.c |  4 ++--
>   include/linux/lightnvm.h     |  2 +-
>   3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index 9b6c1c9..6a5f2f8 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -87,15 +87,15 @@ EXPORT_SYMBOL(nvm_unregister_tgt_type);
>   void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags,
>   							dma_addr_t *dma_handler)
>   {
> -	return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags,
> +	return dev->ops->dev_dma_alloc(dev, dev->dma_pool, mem_flags,
>   								dma_handler);
>   }
>   EXPORT_SYMBOL(nvm_dev_dma_alloc);
>
> -void nvm_dev_dma_free(struct nvm_dev *dev, void *ppa_list,
> +void nvm_dev_dma_free(struct nvm_dev *dev, void *addr,
>   							dma_addr_t dma_handler)
>   {
> -	dev->ops->dev_dma_free(dev->ppalist_pool, ppa_list, dma_handler);
> +	dev->ops->dev_dma_free(dev->dma_pool, addr, dma_handler);
>   }
>   EXPORT_SYMBOL(nvm_dev_dma_free);
>
> @@ -653,8 +653,8 @@ err:
>
>   static void nvm_exit(struct nvm_dev *dev)
>   {
> -	if (dev->ppalist_pool)
> -		dev->ops->destroy_dma_pool(dev->ppalist_pool);
> +	if (dev->dma_pool)
> +		dev->ops->destroy_dma_pool(dev->dma_pool);
>   	nvm_free(dev);
>
>   	pr_info("nvm: successfully unloaded\n");
> @@ -688,9 +688,9 @@ int nvm_register(struct request_queue *q, char *disk_name,
>   	}
>
>   	if (dev->ops->max_phys_sect > 1) {
> -		dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist");
> -		if (!dev->ppalist_pool) {
> -			pr_err("nvm: could not create ppa pool\n");
> +		dev->dma_pool = dev->ops->create_dma_pool(dev, "ppalist");
> +		if (!dev->dma_pool) {
> +			pr_err("nvm: could not create dma pool\n");
>   			ret = -ENOMEM;
>   			goto err_init;
>   		}
> diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
> index 76f1199..33f2315 100644
> --- a/drivers/nvme/host/lightnvm.c
> +++ b/drivers/nvme/host/lightnvm.c
> @@ -565,10 +565,10 @@ static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool,
>   	return dma_pool_alloc(pool, mem_flags, dma_handler);
>   }
>
> -static void nvme_nvm_dev_dma_free(void *pool, void *ppa_list,
> +static void nvme_nvm_dev_dma_free(void *pool, void *addr,
>   							dma_addr_t dma_handler)
>   {
> -	dma_pool_free(pool, ppa_list, dma_handler);
> +	dma_pool_free(pool, addr, dma_handler);
>   }
>
>   static struct nvm_dev_ops nvme_nvm_dev_ops = {
> diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
> index 9d8a350..20e681e 100644
> --- a/include/linux/lightnvm.h
> +++ b/include/linux/lightnvm.h
> @@ -368,7 +368,7 @@ struct nvm_dev {
>   	unsigned max_pages_per_blk;
>
>   	unsigned long *lun_map;
> -	void *ppalist_pool;
> +	void *dma_pool;
>
>   	struct nvm_id identity;

Thanks Javier. Applied for 4.7.