summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mvsdio.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-12 08:46:34 +0200
committerChris Ball <cjb@laptop.org>2013-09-26 03:57:16 +0200
commite02d2930040f993922e9c4449e3d90c8040cfedc (patch)
treef5aeba5c5a62a0d6839773212f46c511ba8c8b27 /drivers/mmc/host/mvsdio.c
parentmmc: core: clean up duplicate macros (diff)
downloadlinux-e02d2930040f993922e9c4449e3d90c8040cfedc.tar.xz
linux-e02d2930040f993922e9c4449e3d90c8040cfedc.zip
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>
Diffstat (limited to 'drivers/mmc/host/mvsdio.c')
-rw-r--r--drivers/mmc/host/mvsdio.c6
1 files changed, 3 insertions, 3 deletions
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;
}