[PATCH 00/15] Convert to use devm_ioremap_resource

[PATCH 00/15] Convert to use devm_ioremap_resource

[Tushar Behera]

These are the remaining instances of devm_request_and_ioremap. Convert
them to use devm_ioremap_resource as introduced by commit
75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()).
Patches 1 to 13 remove occurrences of devm_request_and_ioremap.
Patch 14 modifies one comment that speaks about devm_request_and_ioremap.
Patch 15 removes the definition of devm_request_and_ioremap which
should only be applied if all other pathces are merged.

Tushar Behera (15):
  sparc,leon: Convert to use devm_ioremap_resource
  sudmac: Convert to use devm_ioremap_resource
  mmc: mvsdio: Convert to use devm_ioremap_resource
  gpio_msm: Convert to use devm_ioremap_resource
  gpio-sta2x11: Convert to use devm_ioremap_resource
  net: bcm63xx_enet: Convert to use devm_ioremap_resource
  net: fec: Convert to use devm_ioremap_resource
  net: emaclite: Convert to use devm_ioremap_resource
  net: can: Convert to use devm_ioremap_resource
  Staging: netlogic: Convert to use devm_ioremap_resource
  regulator: ti-abb: Convert to use devm_ioremap_resource
  ASoC: spear: Convert to use devm_ioremap_resource
  pci: mvebu: Convert to use devm_ioremap_resource
  usb: phy: rcar-usb: Fix comment w.r.t. devm_ioremap_resource
  lib: devres: Remove deprecated devm_request_and_ioremap

 Documentation/driver-model/devres.txt         |    1 -
 arch/sparc/kernel/leon_pci_grpci1.c           |    6 +++---
 drivers/dma/sh/sudmac.c                       |    6 +++---
 drivers/gpio/gpio-msm-v1.c                    |   12 +++++------
 drivers/gpio/gpio-sta2x11.c                   |    4 +++-
 drivers/mmc/host/mvsdio.c                     |    6 +++---
 drivers/net/can/c_can/c_can_platform.c        |    4 ++--
 drivers/net/ethernet/broadcom/bcm63xx_enet.c  |   12 +++++------
 drivers/net/ethernet/freescale/fec_main.c     |   12 +++++------
 drivers/net/ethernet/xilinx/xilinx_emaclite.c |    6 ++++--
 drivers/pci/host/pci-mvebu.c                  |    5 +++--
 drivers/regulator/ti-abb-regulator.c          |   12 +++++------
 drivers/staging/netlogic/xlr_net.c            |    8 +++----
 drivers/usb/phy/phy-rcar-usb.c                |    2 +-
 include/linux/device.h                        |    2 --
 lib/devres.c                                  |   28 -------------------------
 sound/soc/spear/spdif_out.c                   |   20 +++++-------------
 17 files changed, 55 insertions(+), 91 deletions(-)

CC: alsa-devel@alsa-project.org
CC: devel@driverdev.osuosl.org
CC: linux-can@vger.kernel.org
CC: linux-doc@vger.kernel.org
CC: linux-gpio@vger.kernel.org
CC: linux-mmc@vger.kernel.org
CC: linux-pci@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: netdev@vger.kernel.org
CC: sparclinux@vger.kernel.org
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Chris Ball <cjb@laptop.org>
CC: Dan Williams <djbw@fb.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: Felipe Balbi <balbi@ti.com>
CC: Grant Likely <grant.likely@linaro.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Liam Girdwood <lgirdwood@gmail.com>
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Marc Kleine-Budde <mkl@pengutronix.de>
CC: Mark Brown <broonie@kernel.org>
CC: Michal Simek <michal.simek@xilinx.com>
CC: Rob Landley <rob@landley.net>
CC: Vinod Koul <vinod.koul@intel.com>
CC: Wolfgang Grandegger <wg@grandegger.com>
-- 
1.7.9.5

[PATCH 13/15] pci: mvebu: Convert to use devm_ioremap_resource

[Tushar Behera]

Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: linux-pci@vger.kernel.org
CC: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/host/pci-mvebu.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 13a633b..e714876 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -752,7 +752,7 @@ mvebu_pcie_map_registers(struct platform_device *pdev,
 	if (ret)
 		return NULL;
 
-	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

Re: [PATCH 13/15] pci: mvebu: Convert to use devm_ioremap_resource

[Sachin Kamat]

On 10 June 2013 17:05, 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().
>
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> CC: linux-pci@vger.kernel.org
> CC: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  drivers/pci/host/pci-mvebu.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index 13a633b..e714876 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -752,7 +752,7 @@ mvebu_pcie_map_registers(struct platform_device *pdev,
>         if (ret)
>                 return NULL;
>
> -       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);

This error message is redundant.

> +                       port->base = NULL;
Probably this is also not needed.

>                         continue;
>                 }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With warm regards,
Sachin

Re: [PATCH 13/15] pci: mvebu: Convert to use devm_ioremap_resource

[Tushar Behera]

On 06/10/2013 07:59 PM, Sachin Kamat wrote:
> On 10 June 2013 17:05, 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().
>>
>> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
>> CC: linux-pci@vger.kernel.org
>> CC: Bjorn Helgaas <bhelgaas@google.com>
>> ---
>>  drivers/pci/host/pci-mvebu.c |    5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
>> index 13a633b..e714876 100644
>> --- a/drivers/pci/host/pci-mvebu.c
>> +++ b/drivers/pci/host/pci-mvebu.c
>> @@ -752,7 +752,7 @@ mvebu_pcie_map_registers(struct platform_device *pdev,
>>         if (ret)
>>                 return NULL;
>>
>> -       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);
> 
> This error message is redundant.
> 

It provides a little more information regarding the port and lane number
which might be useful in debugging.

>> +                       port->base = NULL;
> Probably this is also not needed.
> 

I was not sure about the default error value for port->base, hence I
replicated the old behaviour.

Thanks.
-- 
Tushar Behera

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

[Tushar Behera]

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(-)

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

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

[Bjorn Helgaas]

[+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
>

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

[Ezequiel Garcia]

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?
-- 
Ezequiel García, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

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

[Thomas Petazzoni]

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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

[Bjorn Helgaas]

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