From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 12 Sep 2013 06:46:34 +0000 (+0530)
Subject: mmc: mvsdio: Convert to devm_ioremap_resource
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e02d2930040f993922e9c4449e3d90c8040cfedc;p=openwrt%2Fstaging%2Fblogic.git

mmc: mvsdio: Convert to devm_ioremap_resource

devm_request_and_ioremap() is deprecated. Use devm_ioremap_resource()
instead.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
---

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 06c5b0b28ebc..a592407d2de6 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -775,9 +775,9 @@ static int __init mvsd_probe(struct platform_device *pdev)
 
 	spin_lock_init(&host->lock);
 
-	host->base = devm_request_and_ioremap(&pdev->dev, r);
-	if (!host->base) {
-		ret = -ENOMEM;
+	host->base = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(host->base)) {
+		ret = PTR_ERR(host->base);
 		goto out;
 	}