mmc: mvsdio: Convert to devm_ioremap_resource
authorSachin Kamat <sachin.kamat@linaro.org>
Thu, 12 Sep 2013 06:46:34 +0000 (12:16 +0530)
committerChris Ball <cjb@laptop.org>
Thu, 26 Sep 2013 01:57:16 +0000 (21:57 -0400)
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>
drivers/mmc/host/mvsdio.c

index 06c5b0b..a592407 100644 (file)
@@ -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;
        }