summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-05-14 12:17:14 +0900
committerLee Jones <lee.jones@linaro.org>2014-06-03 08:11:42 +0100
commit63c348cb2b9c41fad259e6471692927f95e61d27 (patch)
treea9aac74c9eee277be79ff5cf18485c6ea3d7ff64 /drivers/mfd
parentdcc21cc09e3c22d0ede4e105afa8884eba293b58 (diff)
mfd: ipaq-micro: Use devm_ioremap_resource()
Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource(). Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ipaq-micro.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
index 1763d6db346e..5d08daf3bd2b 100644
--- a/drivers/mfd/ipaq-micro.c
+++ b/drivers/mfd/ipaq-micro.c
@@ -403,17 +403,17 @@ static int micro_probe(struct platform_device *pdev)
if (!res)
return -EINVAL;
- micro->base = devm_request_and_ioremap(&pdev->dev, res);
- if (!micro->base)
- return -ENOMEM;
+ micro->base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(micro->base))
+ return PTR_ERR(micro->base);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res)
return -EINVAL;
- micro->sdlc = devm_request_and_ioremap(&pdev->dev, res);
- if (!micro->sdlc)
- return -ENOMEM;
+ micro->sdlc = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(micro->sdlc))
+ return PTR_ERR(micro->sdlc);
micro_reset_comm(micro);