Re: [PATCH] PCI: mvebu: mvebu_pcie_map_registers __iomem fix

From: Lorenzo Pieralisi
Date: Thu Oct 17 2019 - 06:19:24 EST


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.dooks@xxxxxxxxxxxxxxx>
> ---
> Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>
> Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: Andrew Murray <andrew.murray@xxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: linux-pci@xxxxxxxxxxxxxxx
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> 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
>