* [PATCH 00/15] Convert to use devm_ioremap_resource
@ 2013-06-10 11:34 Tushar Behera
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Tushar Behera @ 2013-06-10 11:34 UTC (permalink / raw)
To: linux-kernel
Cc: thierry.reding, patches, alsa-devel, devel, linux-can, linux-doc,
linux-gpio, linux-mmc, linux-pci, linux-usb, netdev, sparclinux,
Bjorn Helgaas, Chris Ball, Dan Williams, David S. Miller,
Felipe Balbi, Grant Likely, Greg Kroah-Hartman, Liam Girdwood,
Linus Walleij, Marc Kleine-Budde, Mark Brown, Michal Simek,
Rob Landley, Vinod Koul, Wolfgang Grandegger
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 06/15] net: bcm63xx_enet: Convert to use devm_ioremap_resource
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
@ 2013-06-10 11:35 ` Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 07/15] net: fec: " Tushar Behera
` (2 subsequent siblings)
3 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2013-06-10 11:35 UTC (permalink / raw)
To: linux-kernel; +Cc: thierry.reding, patches, netdev, David S. Miller
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: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
---
* Not compile tested.
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index e46466c..d690308 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1641,9 +1641,9 @@ static int bcm_enet_probe(struct platform_device *pdev)
if (ret)
goto out;
- priv->base = devm_request_and_ioremap(&pdev->dev, res_mem);
- if (priv->base == NULL) {
- ret = -ENOMEM;
+ priv->base = devm_ioremap_resource(&pdev->dev, res_mem);
+ if (IS_ERR(priv->base)) {
+ ret = PTR_ERR(priv->base);
goto out;
}
@@ -1871,9 +1871,9 @@ static int bcm_enet_shared_probe(struct platform_device *pdev)
if (!res)
return -ENODEV;
- bcm_enet_shared_base = devm_request_and_ioremap(&pdev->dev, res);
- if (!bcm_enet_shared_base)
- return -ENOMEM;
+ bcm_enet_shared_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(bcm_enet_shared_base))
+ return PTR_ERR(bcp_enet_shared_base);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/15] net: fec: Convert to use devm_ioremap_resource
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
@ 2013-06-10 11:35 ` Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
3 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2013-06-10 11:35 UTC (permalink / raw)
To: linux-kernel; +Cc: thierry.reding, patches, netdev, David S. Miller
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: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
---
drivers/net/ethernet/freescale/fec_main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index c42c42a..b0d36b7 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1876,17 +1876,17 @@ fec_probe(struct platform_device *pdev)
(pdev->id_entry->driver_data & FEC_QUIRK_HAS_GBIT))
fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
- fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+ fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+ if (IS_ERR(fep->hwp)) {
+ ret = PTR_ERR(fep->hwp);
+ goto failed_ioremap;
+ }
+
fep->pdev = pdev;
fep->dev_id = dev_id++;
fep->bufdesc_ex = 0;
- if (!fep->hwp) {
- ret = -ENOMEM;
- goto failed_ioremap;
- }
-
platform_set_drvdata(pdev, ndev);
ret = of_get_phy_mode(pdev->dev.of_node);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/15] net: emaclite: Convert to use devm_ioremap_resource
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
2013-06-10 11:35 ` [PATCH 07/15] net: fec: " Tushar Behera
@ 2013-06-10 11:35 ` Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
3 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2013-06-10 11:35 UTC (permalink / raw)
To: linux-kernel
Cc: thierry.reding, patches, netdev, David S. Miller, Michal Simek
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: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
CC: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 1cd131b..fd4dbda 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -1159,9 +1159,11 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
ndev->irq = res->start;
res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);
- lp->base_addr = devm_request_and_ioremap(&ofdev->dev, res);
- if (!lp->base_addr)
+ lp->base_addr = devm_ioremap_resource(&ofdev->dev, res);
+ if (IS_ERR(lp->base_addr)) {
+ rc = PTR_ERR(lp->base_addr);
goto error;
+ }
ndev->mem_start = res->start;
ndev->mem_end = res->end;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
` (2 preceding siblings ...)
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
@ 2013-06-10 11:35 ` Tushar Behera
2013-06-10 13:09 ` Marc Kleine-Budde
` (2 more replies)
3 siblings, 3 replies; 14+ messages in thread
From: Tushar Behera @ 2013-06-10 11:35 UTC (permalink / raw)
To: linux-kernel
Cc: thierry.reding, patches, netdev, linux-can, Marc Kleine-Budde,
Wolfgang Grandegger
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: netdev@vger.kernel.org
CC: linux-can@vger.kernel.org
CC: Marc Kleine-Budde <mkl@pengutronix.de>
CC: Wolfgang Grandegger <wg@grandegger.com>
---
drivers/net/can/c_can/c_can_platform.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 6b6130b..b918c73 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
priv->instance = pdev->id;
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- priv->raminit_ctrlreg = devm_request_and_ioremap(&pdev->dev, res);
- if (!priv->raminit_ctrlreg || priv->instance < 0)
+ priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
dev_info(&pdev->dev, "control memory is not used for raminit\n");
else
priv->raminit = c_can_hw_raminit;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
@ 2013-06-10 13:09 ` Marc Kleine-Budde
2013-06-11 3:15 ` Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-13 5:30 ` Tushar Behera
2 siblings, 1 reply; 14+ messages in thread
From: Marc Kleine-Budde @ 2013-06-10 13:09 UTC (permalink / raw)
To: Tushar Behera
Cc: linux-kernel, thierry.reding, patches, netdev, linux-can,
Wolfgang Grandegger
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
On 06/10/2013 01:35 PM, Tushar Behera wrote:
> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
> introduced devm_ioremap_resource() and deprecated the use of
> devm_request_and_ioremap().
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Are the patches going over the individual subsystem maintainers?
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-10 13:09 ` Marc Kleine-Budde
@ 2013-06-11 3:15 ` Tushar Behera
2013-06-12 3:09 ` 'Greg Kroah-Hartman'
0 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2013-06-11 3:15 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: linux-kernel, thierry.reding, patches, netdev, linux-can,
Wolfgang Grandegger, 'Greg Kroah-Hartman'
+CC: 'Greg Kroah-Hartman' <gregkh@linuxfoundation.org>
On 06/10/2013 06:39 PM, Marc Kleine-Budde wrote:
> On 06/10/2013 01:35 PM, Tushar Behera wrote:
>> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
>> introduced devm_ioremap_resource() and deprecated the use of
>> devm_request_and_ioremap().
>
> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
>
> Are the patches going over the individual subsystem maintainers?
>
> Marc
>
I am not sure. Looping in Greg for clarity.
--
Tushar Behera
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-11 3:15 ` Tushar Behera
@ 2013-06-12 3:09 ` 'Greg Kroah-Hartman'
0 siblings, 0 replies; 14+ messages in thread
From: 'Greg Kroah-Hartman' @ 2013-06-12 3:09 UTC (permalink / raw)
To: Tushar Behera
Cc: Marc Kleine-Budde, linux-kernel, thierry.reding, patches, netdev,
linux-can, Wolfgang Grandegger
On Tue, Jun 11, 2013 at 08:45:47AM +0530, Tushar Behera wrote:
> +CC: 'Greg Kroah-Hartman' <gregkh@linuxfoundation.org>
>
> On 06/10/2013 06:39 PM, Marc Kleine-Budde wrote:
> > On 06/10/2013 01:35 PM, Tushar Behera wrote:
> >> Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
> >> introduced devm_ioremap_resource() and deprecated the use of
> >> devm_request_and_ioremap().
> >
> > Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
> >
> > Are the patches going over the individual subsystem maintainers?
> >
> > Marc
> >
>
> I am not sure. Looping in Greg for clarity.
I'm taking the ones for my subsystem(s), the last one should probably go
in after 3.11-rc1 is released, in order to ensure no remaining in-tree
users of the function are still around.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 06/15] net: bcm63xx_enet: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
@ 2013-06-12 9:23 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2013-06-12 9:23 UTC (permalink / raw)
To: tushar.behera; +Cc: linux-kernel, thierry.reding, patches, netdev
From: Tushar Behera <tushar.behera@linaro.org>
Date: Mon, 10 Jun 2013 17:05:04 +0530
> 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>
In net-next, the driver is already using devm_ioremap_resource().
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 07/15] net: fec: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 07/15] net: fec: " Tushar Behera
@ 2013-06-12 9:23 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2013-06-12 9:23 UTC (permalink / raw)
To: tushar.behera; +Cc: linux-kernel, thierry.reding, patches, netdev
From: Tushar Behera <tushar.behera@linaro.org>
Date: Mon, 10 Jun 2013 17:05:05 +0530
> 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>
Applied.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 08/15] net: emaclite: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
@ 2013-06-12 9:23 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2013-06-12 9:23 UTC (permalink / raw)
To: tushar.behera; +Cc: linux-kernel, thierry.reding, patches, netdev, michal.simek
From: Tushar Behera <tushar.behera@linaro.org>
Date: Mon, 10 Jun 2013 17:05:06 +0530
> 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>
Applied.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
2013-06-10 13:09 ` Marc Kleine-Budde
@ 2013-06-12 9:23 ` David Miller
2013-06-13 5:30 ` Tushar Behera
2 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2013-06-12 9:23 UTC (permalink / raw)
To: tushar.behera
Cc: linux-kernel, thierry.reding, patches, netdev, linux-can, mkl, wg
From: Tushar Behera <tushar.behera@linaro.org>
Date: Mon, 10 Jun 2013 17:05:07 +0530
> 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>
Applied.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
2013-06-10 13:09 ` Marc Kleine-Budde
2013-06-12 9:23 ` David Miller
@ 2013-06-13 5:30 ` Tushar Behera
2013-06-13 5:41 ` Sachin Kamat
2 siblings, 1 reply; 14+ messages in thread
From: Tushar Behera @ 2013-06-13 5:30 UTC (permalink / raw)
To: linux-kernel
Cc: thierry.reding, patches, netdev, linux-can, Marc Kleine-Budde,
Wolfgang Grandegger, David S. Miller,
'Greg Kroah-Hartman'
On 06/10/2013 05:05 PM, Tushar Behera 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: netdev@vger.kernel.org
> CC: linux-can@vger.kernel.org
> CC: Marc Kleine-Budde <mkl@pengutronix.de>
> CC: Wolfgang Grandegger <wg@grandegger.com>
> ---
> drivers/net/can/c_can/c_can_platform.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
> index 6b6130b..b918c73 100644
> --- a/drivers/net/can/c_can/c_can_platform.c
> +++ b/drivers/net/can/c_can/c_can_platform.c
> @@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
> priv->instance = pdev->id;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - priv->raminit_ctrlreg = devm_request_and_ioremap(&pdev->dev, res);
> - if (!priv->raminit_ctrlreg || priv->instance < 0)
> + priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
> dev_info(&pdev->dev, "control memory is not used for raminit\n");
> else
> priv->raminit = c_can_hw_raminit;
>
IS_ERR() check on the return value of devm_ioremap_resource produces
following sparse warning. This is because of the __iomem address space
attribute. How should we fix this?
drivers/net/can/c_can/c_can_platform.c:205:32: warning: incorrect type
in argument 1 (different address spaces)
drivers/net/can/c_can/c_can_platform.c:205:32: expected void const *ptr
drivers/net/can/c_can/c_can_platform.c:205:32: got unsigned int
[noderef] [usertype] <asn:2>*raminit_ctrlreg
--
Tushar Behera
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 09/15] net: can: Convert to use devm_ioremap_resource
2013-06-13 5:30 ` Tushar Behera
@ 2013-06-13 5:41 ` Sachin Kamat
0 siblings, 0 replies; 14+ messages in thread
From: Sachin Kamat @ 2013-06-13 5:41 UTC (permalink / raw)
To: Tushar Behera
Cc: linux-kernel, thierry.reding, patches, netdev, linux-can,
Marc Kleine-Budde, Wolfgang Grandegger, David S. Miller,
Greg Kroah-Hartman
On 13 June 2013 11:00, Tushar Behera <tushar.behera@linaro.org> wrote:
> On 06/10/2013 05:05 PM, Tushar Behera 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: netdev@vger.kernel.org
>> CC: linux-can@vger.kernel.org
>> CC: Marc Kleine-Budde <mkl@pengutronix.de>
>> CC: Wolfgang Grandegger <wg@grandegger.com>
>> ---
>> drivers/net/can/c_can/c_can_platform.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
>> index 6b6130b..b918c73 100644
>> --- a/drivers/net/can/c_can/c_can_platform.c
>> +++ b/drivers/net/can/c_can/c_can_platform.c
>> @@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
>> priv->instance = pdev->id;
>>
>> res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> - priv->raminit_ctrlreg = devm_request_and_ioremap(&pdev->dev, res);
>> - if (!priv->raminit_ctrlreg || priv->instance < 0)
>> + priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
>> + if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
>> dev_info(&pdev->dev, "control memory is not used for raminit\n");
>> else
>> priv->raminit = c_can_hw_raminit;
>>
>
> IS_ERR() check on the return value of devm_ioremap_resource produces
> following sparse warning. This is because of the __iomem address space
> attribute. How should we fix this?
>
> drivers/net/can/c_can/c_can_platform.c:205:32: warning: incorrect type
> in argument 1 (different address spaces)
> drivers/net/can/c_can/c_can_platform.c:205:32: expected void const *ptr
> drivers/net/can/c_can/c_can_platform.c:205:32: got unsigned int
> [noderef] [usertype] <asn:2>*raminit_ctrlreg
>
This is a known issue since the time devm_ioremap_resource was
introduced. Thierry had already submitted some fixes for this.
I am not sure if they have been applied yet.
More details here:
https://patchwork.kernel.org/patch/2071361/
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2013-06-13 5:41 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-10 11:34 [PATCH 00/15] Convert to use devm_ioremap_resource Tushar Behera
2013-06-10 11:35 ` [PATCH 06/15] net: bcm63xx_enet: " Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 07/15] net: fec: " Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 08/15] net: emaclite: " Tushar Behera
2013-06-12 9:23 ` David Miller
2013-06-10 11:35 ` [PATCH 09/15] net: can: " Tushar Behera
2013-06-10 13:09 ` Marc Kleine-Budde
2013-06-11 3:15 ` Tushar Behera
2013-06-12 3:09 ` 'Greg Kroah-Hartman'
2013-06-12 9:23 ` David Miller
2013-06-13 5:30 ` Tushar Behera
2013-06-13 5:41 ` Sachin Kamat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).