On Tue, Oct 15, 2019 at 05:11:48PM +0100, Ben Dooks (Codethink) wrote:
> Fix the return type of mvebu_pcie_map_registers in the
> error path to have __iomem on it. Fixes the following
> sparse warning:
> 
> drivers/pci/controller/pci-mvebu.c:716:31: warning: incorrect type in return 
> expression (different address spaces)
> drivers/pci/controller/pci-mvebu.c:716:31:    expected void [noderef] <asn:2> 
> *
> drivers/pci/controller/pci-mvebu.c:716:31:    got void *
> 
> Signed-off-by: Ben Dooks <ben.do...@codethink.co.uk>
> ---
> Cc: Thomas Petazzoni <thomas.petazz...@bootlin.com>
> Cc: Jason Cooper <ja...@lakedaemon.net>
> Cc: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
> Cc: Andrew Murray <andrew.mur...@arm.com>
> Cc: Bjorn Helgaas <bhelg...@google.com>
> Cc: linux-...@vger.kernel.org
> Cc: linux-arm-ker...@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/pci/controller/pci-mvebu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to pci/misc, thanks.

Lorenzo

> diff --git a/drivers/pci/controller/pci-mvebu.c 
> b/drivers/pci/controller/pci-mvebu.c
> index ed032e9a3156..153a64676bc9 100644
> --- a/drivers/pci/controller/pci-mvebu.c
> +++ b/drivers/pci/controller/pci-mvebu.c
> @@ -713,7 +713,7 @@ static void __iomem *mvebu_pcie_map_registers(struct 
> platform_device *pdev,
>  
>       ret = of_address_to_resource(np, 0, &regs);
>       if (ret)
> -             return ERR_PTR(ret);
> +             return (void __iomem *)ERR_PTR(ret);
>  
>       return devm_ioremap_resource(&pdev->dev, &regs);
>  }
> -- 
> 2.23.0
> 

Reply via email to