* [PATCH 1/29] pinctrl: nomadik: simplify use of devm_ioremap_resource
2013-08-14 9:11 [PATCH 0/29] simplify use of devm_ioremap_resource Julia Lawall
@ 2013-08-14 9:11 ` Julia Lawall
2013-08-15 20:02 ` Linus Walleij
2013-08-14 9:11 ` [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: " Julia Lawall
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Julia Lawall @ 2013-08-14 9:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6•fr>
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/pinctrl/pinctrl-nomadik.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 89280bc..be126fc 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -1055,10 +1055,6 @@ static int nmk_gpio_probe(struct platform_device *dev)
pdata->num_gpio = NMK_GPIO_PER_CHIP;
}
- res = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (!res)
- return -ENOENT;
-
irq = platform_get_irq(dev, 0);
if (irq < 0)
return irq;
@@ -1067,6 +1063,7 @@ static int nmk_gpio_probe(struct platform_device *dev)
if (secondary_irq >= 0 && !pdata->get_secondary_status)
return -EINVAL;
+ res = platform_get_resource(dev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&dev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 1/29] pinctrl: nomadik: simplify use of devm_ioremap_resource
2013-08-14 9:11 ` [PATCH 1/29] pinctrl: nomadik: " Julia Lawall
@ 2013-08-15 20:02 ` Linus Walleij
0 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2013-08-15 20:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 14, 2013 at 11:11 AM, Julia Lawall <Julia.Lawall@lip6•fr> wrote:
> From: Julia Lawall <Julia.Lawall@lip6•fr>
>
> Remove unneeded error handling on the result of a call to
> platform_get_resource when the value is passed to devm_ioremap_resource.
>
> Move the call to platform_get_resource adjacent to the call to
> devm_ioremap_resource to make the connection between them more clear.
>
> A simplified version of the semantic patch that makes this change is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression pdev,res,n,e,e1;
> expression ret != 0;
> identifier l;
> @@
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> ... when != res
> - if (res == NULL) { ... \(goto l;\|return ret;\) }
> ... when != res
> + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> e = devm_ioremap_resource(e1, res);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 [PATCH 0/29] simplify use of devm_ioremap_resource Julia Lawall
2013-08-14 9:11 ` [PATCH 1/29] pinctrl: nomadik: " Julia Lawall
@ 2013-08-14 9:11 ` Julia Lawall
2013-08-15 3:17 ` Guenter Roeck
2013-08-14 9:11 ` [PATCH 12/29] sound/soc/samsung/ac97.c: " Julia Lawall
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Julia Lawall @ 2013-08-14 9:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6•fr>
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/watchdog/nuc900_wdt.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index e2b6d2c..b15b6ef 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -256,11 +256,6 @@ static int nuc900wdt_probe(struct platform_device *pdev)
spin_lock_init(&nuc900_wdt->wdt_lock);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res == NULL) {
- dev_err(&pdev->dev, "no memory resource specified\n");
- return -ENOENT;
- }
-
nuc900_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(nuc900_wdt->wdt_base))
return PTR_ERR(nuc900_wdt->wdt_base);
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 ` [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: " Julia Lawall
@ 2013-08-15 3:17 ` Guenter Roeck
2013-08-15 3:29 ` Wan ZongShun
0 siblings, 1 reply; 13+ messages in thread
From: Guenter Roeck @ 2013-08-15 3:17 UTC (permalink / raw)
To: linux-arm-kernel
On 08/14/2013 02:11 AM, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6•fr>
>
> Remove unneeded error handling on the result of a call to
> platform_get_resource when the value is passed to devm_ioremap_resource.
>
> A simplified version of the semantic patch that makes this change is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression pdev,res,n,e,e1;
> expression ret != 0;
> identifier l;
> @@
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> ... when != res
> - if (res == NULL) { ... \(goto l;\|return ret;\) }
> ... when != res
> + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> e = devm_ioremap_resource(e1, res);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
>
Reviewed-by: Guenter Roeck <linux@roeck-us•net>
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: simplify use of devm_ioremap_resource
2013-08-15 3:17 ` Guenter Roeck
@ 2013-08-15 3:29 ` Wan ZongShun
0 siblings, 0 replies; 13+ messages in thread
From: Wan ZongShun @ 2013-08-15 3:29 UTC (permalink / raw)
To: linux-arm-kernel
2013/8/15 Guenter Roeck <linux@roeck-us•net>:
> On 08/14/2013 02:11 AM, Julia Lawall wrote:
>>
>> From: Julia Lawall <Julia.Lawall@lip6•fr>
>>
>> Remove unneeded error handling on the result of a call to
>> platform_get_resource when the value is passed to devm_ioremap_resource.
>>
>> A simplified version of the semantic patch that makes this change is as
>> follows: (http://coccinelle.lip6.fr/)
>>
>> // <smpl>
>> @@
>> expression pdev,res,n,e,e1;
>> expression ret != 0;
>> identifier l;
>> @@
>>
>> - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
>> ... when != res
>> - if (res == NULL) { ... \(goto l;\|return ret;\) }
>> ... when != res
>> + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
>> e = devm_ioremap_resource(e1, res);
>> // </smpl>
>>
>> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
>>
> Reviewed-by: Guenter Roeck <linux@roeck-us•net>
Acked-by: Wan Zongshun <mcuos.com@gmail•com>
Thanks for your patch.
>
>
--
Wan ZongShun.
www.mcuos.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 12/29] sound/soc/samsung/ac97.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 [PATCH 0/29] simplify use of devm_ioremap_resource Julia Lawall
2013-08-14 9:11 ` [PATCH 1/29] pinctrl: nomadik: " Julia Lawall
2013-08-14 9:11 ` [PATCH 10/29] drivers/watchdog/nuc900_wdt.c: " Julia Lawall
@ 2013-08-14 9:11 ` Julia Lawall
2013-08-14 18:14 ` Mark Brown
2013-08-14 9:11 ` [PATCH 20/29] watchdog: s3c2410_wdt: " Julia Lawall
2013-08-14 9:11 ` [PATCH 25/29] drivers/spi/spi-sirf.c: " Julia Lawall
4 siblings, 1 reply; 13+ messages in thread
From: Julia Lawall @ 2013-08-14 9:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6•fr>
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
sound/soc/samsung/ac97.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 2dd623f..c732df9 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -404,18 +404,13 @@ static int s3c_ac97_probe(struct platform_device *pdev)
return -ENXIO;
}
- mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!mem_res) {
- dev_err(&pdev->dev, "Unable to get register resource\n");
- return -ENXIO;
- }
-
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq_res) {
dev_err(&pdev->dev, "AC97 IRQ not provided!\n");
return -ENXIO;
}
+ mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
s3c_ac97.regs = devm_ioremap_resource(&pdev->dev, mem_res);
if (IS_ERR(s3c_ac97.regs))
return PTR_ERR(s3c_ac97.regs);
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 20/29] watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource
2013-08-14 9:11 [PATCH 0/29] simplify use of devm_ioremap_resource Julia Lawall
` (2 preceding siblings ...)
2013-08-14 9:11 ` [PATCH 12/29] sound/soc/samsung/ac97.c: " Julia Lawall
@ 2013-08-14 9:11 ` Julia Lawall
2013-08-15 3:19 ` Guenter Roeck
2013-08-14 9:11 ` [PATCH 25/29] drivers/spi/spi-sirf.c: " Julia Lawall
4 siblings, 1 reply; 13+ messages in thread
From: Julia Lawall @ 2013-08-14 9:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6•fr>
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/watchdog/s3c2410_wdt.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 6a22cf5..9fbc993 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -325,12 +325,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
dev = &pdev->dev;
wdt_dev = &pdev->dev;
- wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (wdt_mem == NULL) {
- dev_err(dev, "no memory resource specified\n");
- return -ENOENT;
- }
-
wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (wdt_irq == NULL) {
dev_err(dev, "no irq resource specified\n");
@@ -339,6 +333,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
}
/* get the memory region for the watchdog timer */
+ wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (IS_ERR(wdt_base)) {
ret = PTR_ERR(wdt_base);
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 20/29] watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource
2013-08-14 9:11 ` [PATCH 20/29] watchdog: s3c2410_wdt: " Julia Lawall
@ 2013-08-15 3:19 ` Guenter Roeck
0 siblings, 0 replies; 13+ messages in thread
From: Guenter Roeck @ 2013-08-15 3:19 UTC (permalink / raw)
To: linux-arm-kernel
On 08/14/2013 02:11 AM, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6•fr>
>
> Remove unneeded error handling on the result of a call to
> platform_get_resource when the value is passed to devm_ioremap_resource.
>
> Move the call to platform_get_resource adjacent to the call to
> devm_ioremap_resource to make the connection between them more clear.
>
> A simplified version of the semantic patch that makes this change is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression pdev,res,n,e,e1;
> expression ret != 0;
> identifier l;
> @@
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> ... when != res
> - if (res == NULL) { ... \(goto l;\|return ret;\) }
> ... when != res
> + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> e = devm_ioremap_resource(e1, res);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
>
Reviewed-by: Guenter Roeck <linux@roeck-us•net>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 25/29] drivers/spi/spi-sirf.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 [PATCH 0/29] simplify use of devm_ioremap_resource Julia Lawall
` (3 preceding siblings ...)
2013-08-14 9:11 ` [PATCH 20/29] watchdog: s3c2410_wdt: " Julia Lawall
@ 2013-08-14 9:11 ` Julia Lawall
2013-08-14 9:16 ` Barry Song
2013-08-14 18:09 ` Mark Brown
4 siblings, 2 replies; 13+ messages in thread
From: Julia Lawall @ 2013-08-14 9:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6•fr>
Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.
Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.
A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@
- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
e = devm_ioremap_resource(e1, res);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/spi/spi-sirf.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 62c92c3..546fae2 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -588,12 +588,6 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, master);
sspi = spi_master_get_devdata(master);
- mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!mem_res) {
- dev_err(&pdev->dev, "Unable to get IO resource\n");
- ret = -ENODEV;
- goto free_master;
- }
master->num_chipselect = num_cs;
for (i = 0; i < master->num_chipselect; i++) {
@@ -620,6 +614,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
}
}
+ mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
sspi->base = devm_ioremap_resource(&pdev->dev, mem_res);
if (IS_ERR(sspi->base)) {
ret = PTR_ERR(sspi->base);
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 25/29] drivers/spi/spi-sirf.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 ` [PATCH 25/29] drivers/spi/spi-sirf.c: " Julia Lawall
@ 2013-08-14 9:16 ` Barry Song
2013-08-14 18:09 ` Mark Brown
1 sibling, 0 replies; 13+ messages in thread
From: Barry Song @ 2013-08-14 9:16 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Julia Lawall [mailto:Julia.Lawall at lip6.fr]
> Sent: Wednesday, August 14, 2013 5:11 PM
> To: Barry Song
> Cc: kernel-janitors at vger.kernel.org; Mark Brown;
> linux-arm-kernel at lists.infradead.org; linux-spi at vger.kernel.org;
> linux-kernel at vger.kernel.org
> Subject: [PATCH 25/29] drivers/spi/spi-sirf.c: simplify use of
> devm_ioremap_resource
>
> From: Julia Lawall <Julia.Lawall@lip6•fr>
>
> Remove unneeded error handling on the result of a call to
> platform_get_resource when the value is passed to devm_ioremap_resource.
>
> Move the call to platform_get_resource adjacent to the call to
> devm_ioremap_resource to make the connection between them more clear.
>
> A simplified version of the semantic patch that makes this change is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression pdev,res,n,e,e1;
> expression ret != 0;
> identifier l;
> @@
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> ... when != res
> - if (res == NULL) { ... \(goto l;\|return ret;\) }
> ... when != res
> + res = platform_get_resource(pdev, IORESOURCE_MEM, n);
> e = devm_ioremap_resource(e1, res);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
Acked-by: Barry Song <Baohua.Song@csr•com>
>
> ---
> drivers/spi/spi-sirf.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 25/29] drivers/spi/spi-sirf.c: simplify use of devm_ioremap_resource
2013-08-14 9:11 ` [PATCH 25/29] drivers/spi/spi-sirf.c: " Julia Lawall
2013-08-14 9:16 ` Barry Song
@ 2013-08-14 18:09 ` Mark Brown
1 sibling, 0 replies; 13+ messages in thread
From: Mark Brown @ 2013-08-14 18:09 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 14, 2013 at 11:11:29AM +0200, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6•fr>
>
> Remove unneeded error handling on the result of a call to
> platform_get_resource when the value is passed to devm_ioremap_resource.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130814/5588ecf8/attachment.sig>
^ permalink raw reply [flat|nested] 13+ messages in thread