Patchwork [V2,6/6] pci: mvebu: Convert to use devm_ioremap_resource

login
register
mail settings
Submitter Tushar Behera
Date June 17, 2013, 9:16 a.m.
Message ID <1371460573-30004-1-git-send-email-tushar.behera@linaro.org>
Download mbox | patch
Permalink /patch/251796/
State Not Applicable
Headers show

Comments

Tushar Behera - June 17, 2013, 9:16 a.m.
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@linaro.org>
CC: linux-pci@vger.kernel.org
CC: Bjorn Helgaas <bhelgaas@google.com>
---
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(-)
Bjorn Helgaas - July 23, 2013, 6:38 p.m.
[+cc Thomas]

On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@linaro.org> 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@linaro.org>
> CC: linux-pci@vger.kernel.org
> CC: Bjorn Helgaas <bhelgaas@google.com>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ezequiel Garcia - July 23, 2013, 8:19 p.m.
On Tue, Jul 23, 2013 at 12:38:28PM -0600, Bjorn Helgaas wrote:
> [+cc Thomas]
> 
> On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@linaro.org> 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@linaro.org>
> > CC: linux-pci@vger.kernel.org
> > CC: Bjorn Helgaas <bhelgaas@google.com>
> 
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> 

Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>A

> 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.
> 

We have the MBus DT patches, to say the least.
Not sure if it conflicts with this and how we should handle it in that
case.

Jason, any ideas?
Thomas Petazzoni - Aug. 6, 2013, 10:39 a.m.
Dear Bjorn Helgaas,

[+cc Jason Cooper, Gregory Clement and Ezequiel Garcia]

On Tue, 23 Jul 2013 12:38:28 -0600, Bjorn Helgaas wrote:
> [+cc Thomas]
> 
> On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@linaro.org> 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@linaro.org>
> > CC: linux-pci@vger.kernel.org
> > CC: Bjorn Helgaas <bhelgaas@google.com>
> 
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> 
> 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.

I don't really have that many pci-mvebu.c patches in the pipeline
actually. The only one I have is to enable MSI support, and it's a
fairly light one that should not conflict too badly with this one.

Therefore, Bjorn, I believe this patch could go through your tree,
either for 3.11 or 3.12 as you prefer.

Best regards,

Thomas Petazzoni
Bjorn Helgaas - Aug. 6, 2013, 6:10 p.m.
On Tue, Aug 6, 2013 at 4:39 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Bjorn Helgaas,
>
> [+cc Jason Cooper, Gregory Clement and Ezequiel Garcia]
>
> On Tue, 23 Jul 2013 12:38:28 -0600, Bjorn Helgaas wrote:
>> [+cc Thomas]
>>
>> On Mon, Jun 17, 2013 at 3:16 AM, Tushar Behera <tushar.behera@linaro.org> 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@linaro.org>
>> > CC: linux-pci@vger.kernel.org
>> > CC: Bjorn Helgaas <bhelgaas@google.com>
>>
>> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
>>
>> 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.
>
> I don't really have that many pci-mvebu.c patches in the pipeline
> actually. The only one I have is to enable MSI support, and it's a
> fairly light one that should not conflict too badly with this one.
>
> Therefore, Bjorn, I believe this patch could go through your tree,
> either for 3.11 or 3.12 as you prefer.

Added to pci/misc for v3.12.  Thanks.

Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;
 		}