Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / mfd / ipaq-micro.c

diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
index a1d9be82734dec40991a0f714941450bbb4998d6..e92eeeb67a98a025667bc537345fd5102cf1bac4 100644 (file)
--- a/drivers/mfd/ipaq-micro.c
+++ b/drivers/mfd/ipaq-micro.c
@@ -396,11 +396,7 @@ static int __init micro_probe(struct platform_device *pdev)
        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_ioremap_resource(&pdev->dev, res);
+       micro->sdlc = devm_platform_ioremap_resource(pdev, 1);
        if (IS_ERR(micro->sdlc))
                return PTR_ERR(micro->sdlc);