Re: [PATCH] cxl/pci: Fixup devm_cxl_iomap_block() to take a 'struct device *'

[Jonathan Cameron <Jonathan.Cameron@Huawei.com>]

On Thu, 27 May 2021 18:39:11 -0700
Dan Williams <dan.j.williams@intel.com> wrote:

> The expectation is that devm functions take 'struct device *' and pci
> functions take 'struct pci_dev *'. Swap out the @pdev argument for @dev
> and fixup related helpers.
> 
> Cc: Ira Weiny <ira.weiny@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Agreed, this fits better with expectations.

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
> 
> base-commit: 6630d31c912ed2dfbc035caf0f54709b50ce779e
> 
>  drivers/cxl/core.c |   15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/cxl/core.c b/drivers/cxl/core.c
> index f41a38e87606..80e6d65f8652 100644
> --- a/drivers/cxl/core.c
> +++ b/drivers/cxl/core.c
> @@ -154,15 +154,14 @@ void cxl_probe_device_regs(struct device *dev, void __iomem *base,
>  }
>  EXPORT_SYMBOL_GPL(cxl_probe_device_regs);
>  
> -static void __iomem *devm_cxl_iomap_block(struct pci_dev *pdev,
> +static void __iomem *devm_cxl_iomap_block(struct device *dev,
>  					  resource_size_t addr,
>  					  resource_size_t length)
>  {
> -	struct device *dev = &pdev->dev;
>  	void __iomem *ret_val;
>  	struct resource *res;
>  
> -	res = devm_request_mem_region(dev, addr, length, pci_name(pdev));
> +	res = devm_request_mem_region(dev, addr, length, dev_name(dev));
>  	if (!res) {
>  		dev_err(dev, "Failed to request region %#llx-%#llx\n",
>  			addr, addr+length);
> @@ -181,6 +180,7 @@ int cxl_map_component_regs(struct pci_dev *pdev,
>  			   struct cxl_component_regs *regs,
>  			   struct cxl_register_map *map)
>  {
> +	struct device *dev = &pdev->dev;
>  	resource_size_t phys_addr;
>  	resource_size_t length;
>  
> @@ -189,7 +189,7 @@ int cxl_map_component_regs(struct pci_dev *pdev,
>  
>  	phys_addr += map->component_map.hdm_decoder.offset;
>  	length = map->component_map.hdm_decoder.size;
> -	regs->hdm_decoder = devm_cxl_iomap_block(pdev, phys_addr, length);
> +	regs->hdm_decoder = devm_cxl_iomap_block(dev, phys_addr, length);
>  	if (!regs->hdm_decoder)
>  		return -ENOMEM;
>  
> @@ -201,6 +201,7 @@ int cxl_map_device_regs(struct pci_dev *pdev,
>  			struct cxl_device_regs *regs,
>  			struct cxl_register_map *map)
>  {
> +	struct device *dev = &pdev->dev;
>  	resource_size_t phys_addr;
>  
>  	phys_addr = pci_resource_start(pdev, map->barno);
> @@ -212,7 +213,7 @@ int cxl_map_device_regs(struct pci_dev *pdev,
>  
>  		addr = phys_addr + map->device_map.status.offset;
>  		length = map->device_map.status.size;
> -		regs->status = devm_cxl_iomap_block(pdev, addr, length);
> +		regs->status = devm_cxl_iomap_block(dev, addr, length);
>  		if (!regs->status)
>  			return -ENOMEM;
>  	}
> @@ -223,7 +224,7 @@ int cxl_map_device_regs(struct pci_dev *pdev,
>  
>  		addr = phys_addr + map->device_map.mbox.offset;
>  		length = map->device_map.mbox.size;
> -		regs->mbox = devm_cxl_iomap_block(pdev, addr, length);
> +		regs->mbox = devm_cxl_iomap_block(dev, addr, length);
>  		if (!regs->mbox)
>  			return -ENOMEM;
>  	}
> @@ -234,7 +235,7 @@ int cxl_map_device_regs(struct pci_dev *pdev,
>  
>  		addr = phys_addr + map->device_map.memdev.offset;
>  		length = map->device_map.memdev.size;
> -		regs->memdev = devm_cxl_iomap_block(pdev, addr, length);
> +		regs->memdev = devm_cxl_iomap_block(dev, addr, length);
>  		if (!regs->memdev)
>  			return -ENOMEM;
>  	}
>