* [PATCH 1/6] drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
2011-12-27 14:01 [PATCH 0/6] use devm_request_and_ioremap Julia Lawall
@ 2011-12-27 14:01 ` Julia Lawall
2012-01-02 8:44 ` Grant Likely
2011-12-27 14:01 ` [PATCH 3/6] drivers/watchdog/imx2_wdt.c: " Julia Lawall
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:01 UTC (permalink / raw)
To: Grant Likely
Cc: kernel-janitors, Linus Walleij, Rob Herring, linux-kernel,
devicetree-discuss
From: Julia Lawall <julia@diku.dk>
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/gpio/gpio-tegra.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 61044c8..bdc2937 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -361,14 +361,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
return -ENODEV;
}
- if (!devm_request_mem_region(&pdev->dev, res->start,
- resource_size(res),
- dev_name(&pdev->dev))) {
- dev_err(&pdev->dev, "Couldn't request MEM resource\n");
- return -ENODEV;
- }
-
- regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+ regs = devm_request_and_ioremap(&pdev->dev, res);
if (!regs) {
dev_err(&pdev->dev, "Couldn't ioremap regs\n");
return -ENODEV;
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/6] drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
2011-12-27 14:01 ` [PATCH 1/6] drivers/gpio/gpio-tegra.c: " Julia Lawall
@ 2012-01-02 8:44 ` Grant Likely
0 siblings, 0 replies; 10+ messages in thread
From: Grant Likely @ 2012-01-02 8:44 UTC (permalink / raw)
To: Julia Lawall
Cc: kernel-janitors, Linus Walleij, Rob Herring, linux-kernel,
devicetree-discuss
On Tue, Dec 27, 2011 at 03:01:26PM +0100, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
Merged, thanks.
g.
>
> Reimplement a call to devm_request_mem_region followed by a call to ioremap
> or ioremap_nocache by a call to devm_request_and_ioremap.
>
> The semantic patch that makes this transformation is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @nm@
> expression myname;
> identifier i;
> @@
>
> struct platform_driver i = { .driver = { .name = myname } };
>
> @@
> expression dev,res,size;
> expression nm.myname;
> @@
>
> -if (!devm_request_mem_region(dev, res->start, size,
> - \(res->name\|dev_name(dev)\|myname\))) {
> - ...
> - return ...;
> -}
> ... when != res->start
> (
> -devm_ioremap(dev,res->start,size)
> +devm_request_and_ioremap(dev,res)
> |
> -devm_ioremap_nocache(dev,res->start,size)
> +devm_request_and_ioremap(dev,res)
> )
> ... when any
> when != res->start
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> drivers/gpio/gpio-tegra.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
> index 61044c8..bdc2937 100644
> --- a/drivers/gpio/gpio-tegra.c
> +++ b/drivers/gpio/gpio-tegra.c
> @@ -361,14 +361,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
> return -ENODEV;
> }
>
> - if (!devm_request_mem_region(&pdev->dev, res->start,
> - resource_size(res),
> - dev_name(&pdev->dev))) {
> - dev_err(&pdev->dev, "Couldn't request MEM resource\n");
> - return -ENODEV;
> - }
> -
> - regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> + regs = devm_request_and_ioremap(&pdev->dev, res);
> if (!regs) {
> dev_err(&pdev->dev, "Couldn't ioremap regs\n");
> return -ENODEV;
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/6] drivers/watchdog/imx2_wdt.c: use devm_request_and_ioremap
2011-12-27 14:01 [PATCH 0/6] use devm_request_and_ioremap Julia Lawall
2011-12-27 14:01 ` [PATCH 1/6] drivers/gpio/gpio-tegra.c: " Julia Lawall
@ 2011-12-27 14:01 ` Julia Lawall
2011-12-27 14:01 ` [PATCH 4/6] drivers/watchdog/dw_wdt.c: " Julia Lawall
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:01 UTC (permalink / raw)
To: Wim Van Sebroeck
Cc: kernel-janitors, Grant Likely, Rob Herring, linux-watchdog,
linux-kernel, devicetree-discuss
From: Julia Lawall <julia@diku.dk>
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The variable res_size is then no longer needed.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/watchdog/imx2_wdt.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index b8ef2c6..c44c333 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = {
static int __init imx2_wdt_probe(struct platform_device *pdev)
{
int ret;
- int res_size;
struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
return -ENODEV;
}
- res_size = resource_size(res);
- if (!devm_request_mem_region(&pdev->dev, res->start, res_size,
- res->name)) {
- dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",
- res_size, res->start);
- return -ENOMEM;
- }
-
- imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size);
+ imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
if (!imx2_wdt.base) {
dev_err(&pdev->dev, "ioremap failed\n");
return -ENOMEM;
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 4/6] drivers/watchdog/dw_wdt.c: use devm_request_and_ioremap
2011-12-27 14:01 [PATCH 0/6] use devm_request_and_ioremap Julia Lawall
2011-12-27 14:01 ` [PATCH 1/6] drivers/gpio/gpio-tegra.c: " Julia Lawall
2011-12-27 14:01 ` [PATCH 3/6] drivers/watchdog/imx2_wdt.c: " Julia Lawall
@ 2011-12-27 14:01 ` Julia Lawall
2011-12-27 14:01 ` [PATCH 5/6] drivers/char/hw_random/tx4939-rng.c: " Julia Lawall
2011-12-27 14:01 ` [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: " Julia Lawall
4 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:01 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: kernel-janitors, linux-watchdog, linux-kernel
From: Julia Lawall <julia@diku.dk>
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/watchdog/dw_wdt.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 1b0e3dd..63d7b58 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)
if (!mem)
return -EINVAL;
- if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
- "dw_wdt"))
- return -ENOMEM;
-
- dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+ dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
if (!dw_wdt.regs)
return -ENOMEM;
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 5/6] drivers/char/hw_random/tx4939-rng.c: use devm_request_and_ioremap
2011-12-27 14:01 [PATCH 0/6] use devm_request_and_ioremap Julia Lawall
` (2 preceding siblings ...)
2011-12-27 14:01 ` [PATCH 4/6] drivers/watchdog/dw_wdt.c: " Julia Lawall
@ 2011-12-27 14:01 ` Julia Lawall
2012-01-13 5:36 ` Herbert Xu
2011-12-27 14:01 ` [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: " Julia Lawall
4 siblings, 1 reply; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:01 UTC (permalink / raw)
To: Matt Mackall; +Cc: kernel-janitors, Herbert Xu, linux-kernel
From: Julia Lawall <julia@diku.dk>
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/char/hw_random/tx4939-rng.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/char/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c
index 0bc0cb7..de473ef 100644
--- a/drivers/char/hw_random/tx4939-rng.c
+++ b/drivers/char/hw_random/tx4939-rng.c
@@ -115,10 +115,7 @@ static int __init tx4939_rng_probe(struct platform_device *dev)
rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL);
if (!rngdev)
return -ENOMEM;
- if (!devm_request_mem_region(&dev->dev, r->start, resource_size(r),
- dev_name(&dev->dev)))
- return -EBUSY;
- rngdev->base = devm_ioremap(&dev->dev, r->start, resource_size(r));
+ rngdev->base = devm_request_and_ioremap(&dev->dev, r);
if (!rngdev->base)
return -EBUSY;
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: use devm_request_and_ioremap
2011-12-27 14:01 [PATCH 0/6] use devm_request_and_ioremap Julia Lawall
` (3 preceding siblings ...)
2011-12-27 14:01 ` [PATCH 5/6] drivers/char/hw_random/tx4939-rng.c: " Julia Lawall
@ 2011-12-27 14:01 ` Julia Lawall
2011-12-27 14:45 ` Artem Bityutskiy
4 siblings, 1 reply; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:01 UTC (permalink / raw)
To: David Woodhouse; +Cc: kernel-janitors, linux-mtd, linux-kernel
From: Julia Lawall <julia@diku.dk>
Reimplement a call to devm_request_mem_region followed by a call to ioremap
or ioremap_nocache by a call to devm_request_and_ioremap.
The semantic patch that makes this transformation is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@nm@
expression myname;
identifier i;
@@
struct platform_driver i = { .driver = { .name = myname } };
@@
expression dev,res,size;
expression nm.myname;
@@
-if (!devm_request_mem_region(dev, res->start, size,
- \(res->name\|dev_name(dev)\|myname\))) {
- ...
- return ...;
-}
... when != res->start
(
-devm_ioremap(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
|
-devm_ioremap_nocache(dev,res->start,size)
+devm_request_and_ioremap(dev,res)
)
... when any
when != res->start
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
drivers/mtd/nand/txx9ndfmc.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index ace46fd..c7c4f1d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -298,11 +298,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL);
if (!drvdata)
return -ENOMEM;
- if (!devm_request_mem_region(&dev->dev, res->start,
- resource_size(res), dev_name(&dev->dev)))
- return -EBUSY;
- drvdata->base = devm_ioremap(&dev->dev, res->start,
- resource_size(res));
+ drvdata->base = devm_request_and_ioremap(&dev->dev, res);
if (!drvdata->base)
return -EBUSY;
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: use devm_request_and_ioremap
2011-12-27 14:01 ` [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: " Julia Lawall
@ 2011-12-27 14:45 ` Artem Bityutskiy
2011-12-27 14:46 ` Julia Lawall
0 siblings, 1 reply; 10+ messages in thread
From: Artem Bityutskiy @ 2011-12-27 14:45 UTC (permalink / raw)
To: Julia Lawall; +Cc: David Woodhouse, kernel-janitors, linux-mtd, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]
On Tue, 2011-12-27 at 15:01 +0100, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Reimplement a call to devm_request_mem_region followed by a call to ioremap
> or ioremap_nocache by a call to devm_request_and_ioremap.
>
> The semantic patch that makes this transformation is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @nm@
> expression myname;
> identifier i;
> @@
>
> struct platform_driver i = { .driver = { .name = myname } };
>
> @@
> expression dev,res,size;
> expression nm.myname;
> @@
>
> -if (!devm_request_mem_region(dev, res->start, size,
> - \(res->name\|dev_name(dev)\|myname\))) {
> - ...
> - return ...;
> -}
> ... when != res->start
> (
> -devm_ioremap(dev,res->start,size)
> +devm_request_and_ioremap(dev,res)
> |
> -devm_ioremap_nocache(dev,res->start,size)
> +devm_request_and_ioremap(dev,res)
> )
> ... when any
> when != res->start
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
Pushed to l2-mtd-2.6.git, thanks!
I think this semantic patch is also useful and deserves to be added to
scripts/coccinelle. In general, it would be great if you sumbitted
useful spatches there for inclusion.
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 6/6] drivers/mtd/nand/txx9ndfmc.c: use devm_request_and_ioremap
2011-12-27 14:45 ` Artem Bityutskiy
@ 2011-12-27 14:46 ` Julia Lawall
0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2011-12-27 14:46 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: David Woodhouse, kernel-janitors, linux-mtd, linux-kernel
On Tue, 27 Dec 2011, Artem Bityutskiy wrote:
> On Tue, 2011-12-27 at 15:01 +0100, Julia Lawall wrote:
>> From: Julia Lawall <julia@diku.dk>
>>
>> Reimplement a call to devm_request_mem_region followed by a call to ioremap
>> or ioremap_nocache by a call to devm_request_and_ioremap.
>>
>> The semantic patch that makes this transformation is as follows:
>> (http://coccinelle.lip6.fr/)
>>
>> // <smpl>
>> @nm@
>> expression myname;
>> identifier i;
>> @@
>>
>> struct platform_driver i = { .driver = { .name = myname } };
>>
>> @@
>> expression dev,res,size;
>> expression nm.myname;
>> @@
>>
>> -if (!devm_request_mem_region(dev, res->start, size,
>> - \(res->name\|dev_name(dev)\|myname\))) {
>> - ...
>> - return ...;
>> -}
>> ... when != res->start
>> (
>> -devm_ioremap(dev,res->start,size)
>> +devm_request_and_ioremap(dev,res)
>> |
>> -devm_ioremap_nocache(dev,res->start,size)
>> +devm_request_and_ioremap(dev,res)
>> )
>> ... when any
>> when != res->start
>> // </smpl>
>>
>> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> Pushed to l2-mtd-2.6.git, thanks!
>
> I think this semantic patch is also useful and deserves to be added to
> scripts/coccinelle. In general, it would be great if you sumbitted
> useful spatches there for inclusion.
OK, I will add this one as well.
julia
^ permalink raw reply [flat|nested] 10+ messages in thread