Re: [PATCH V2 6/6] pci: mvebu: Convert to use devm_ioremap_resource

[Bjorn Helgaas <bhelgaas@xxxxxxxxxx>]

[+cc Thomas]

On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@xxxxxxxxxx> wrote:
> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
> introduced devm_ioremap_resource() and deprecated the use of
> devm_request_and_ioremap().
>
> While at it, modify mvebu_pcie_map_registers() to propagate error code.
>
> Signed-off-by: Tushar Behera <tushar.behera@xxxxxxxxxx>
> CC: linux-pci@xxxxxxxxxxxxxxx
> CC: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>

Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>

Thomas has a bunch of mvebu patches in the pipeline, so I assume he
will incorporate this if appropriate.  I don't want to put it in my
tree and cause conflicts with his changes.  Let me know if I should do
something else here.

Bjorn

> ---
> Changes for V2:
> * Return proper error code in mvebu_pcie_map_registers.
>
>  drivers/pci/host/pci-mvebu.c |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index 13a633b..8fc2a82 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -750,9 +750,9 @@ mvebu_pcie_map_registers(struct platform_device *pdev,
>
>         ret = of_address_to_resource(np, 0, &regs);
>         if (ret)
> -               return NULL;
> +               return ERR_PTR(ret);
>
> -       return devm_request_and_ioremap(&pdev->dev, &regs);
> +       return devm_ioremap_resource(&pdev->dev, &regs);
>  }
>
>  static int __init mvebu_pcie_probe(struct platform_device *pdev)
> @@ -842,9 +842,10 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
>                         continue;
>
>                 port->base = mvebu_pcie_map_registers(pdev, child, port);
> -               if (!port->base) {
> +               if (IS_ERR(port->base)) {
>                         dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
>                                 port->port, port->lane);
> +                       port->base = NULL;
>                         continue;
>                 }
>
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html