2013-05-02 15:00:52

by Laurent Navet

[permalink] [raw]
Subject: [PATCH] drivers: mtd: devices: elm: use devm_ioremap_resource()

Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.

Found with coccicheck and this semantic patch:
scripts/coccinelle/api/devm_request_and_ioremap.cocci.

Signed-off-by: Laurent Navet <[email protected]>
---
drivers/mtd/devices/elm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/elm.c b/drivers/mtd/devices/elm.c
index 2ec5da9..2bafb06 100644
--- a/drivers/mtd/devices/elm.c
+++ b/drivers/mtd/devices/elm.c
@@ -344,9 +344,9 @@ static int elm_probe(struct platform_device *pdev)
return -ENODEV;
}

- info->elm_base = devm_request_and_ioremap(&pdev->dev, res);
- if (!info->elm_base)
- return -EADDRNOTAVAIL;
+ info->elm_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(info->elm_base))
+ return PTR_ERR(info->elm_base);

ret = devm_request_irq(&pdev->dev, irq->start, elm_isr, 0,
pdev->name, info);
--
1.7.10.4


2013-05-29 12:37:18

by Artem Bityutskiy

[permalink] [raw]
Subject: Re: [PATCH] drivers: mtd: devices: elm: use devm_ioremap_resource()

On Thu, 2013-05-02 at 17:09 +0200, Laurent Navet wrote:
> Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
>
> Found with coccicheck and this semantic patch:
> scripts/coccinelle/api/devm_request_and_ioremap.cocci.
>
> Signed-off-by: Laurent Navet <[email protected]>

We already have this changed in the l2-mtd.git tree:

commit f7393098da2aadf535787c74abd147aabaca491a
Author: Silviu-Mihai Popescu <[email protected]>
Date: Thu Apr 11 00:01:51 2013 +0300

mtd: devices: convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

Signed-off-by: Silviu-Mihai Popescu <[email protected]>
Signed-off-by: Artem Bityutskiy <[email protected]>


--
Best Regards,
Artem Bityutskiy