Patchwork drivers: mtd: devices: convert to devm_ioremap_resource()

login
register
mail settings
Submitter Silviu-Mihai Popescu
Date April 10, 2013, 9:01 p.m.
Message ID <1365627711-17476-1-git-send-email-silviupopescu1990@gmail.com>
Download mbox | patch
Permalink /patch/235489/
State Accepted
Commit 435796889d714ffaf90923cfea868d8b5d28008c
Headers show

Comments

Silviu-Mihai Popescu - April 10, 2013, 9:01 p.m.
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 <silviupopescu1990@gmail.com>
---
 drivers/mtd/devices/elm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Artem Bityutskiy - May 10, 2013, 2:43 p.m.
On Thu, 2013-04-11 at 00:01 +0300, Silviu-Mihai Popescu wrote:
> 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 <silviupopescu1990@gmail.com>

Pushed to l2-mtd.git, thanks!

Patch

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