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

[linux.git] / drivers / gpio / gpio-hlwd.c

diff --git a/drivers/gpio/gpio-hlwd.c b/drivers/gpio/gpio-hlwd.c
index a7b17897356e4f65f9db52bafccbb6bc8b37f722..e5fa00f8145f3e41eba8f48f851d832b42d88ac8 100644 (file)
--- a/drivers/gpio/gpio-hlwd.c
+++ b/drivers/gpio/gpio-hlwd.c
@@ -208,7 +208,6 @@ static int hlwd_gpio_irq_set_type(struct irq_data *data, unsigned int flow_type)
 static int hlwd_gpio_probe(struct platform_device *pdev)
 {
        struct hlwd_gpio *hlwd;
-       struct resource *regs_resource;
        u32 ngpios;
        int res;
 
@@ -216,8 +215,7 @@ static int hlwd_gpio_probe(struct platform_device *pdev)
        if (!hlwd)
                return -ENOMEM;
 
-       regs_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       hlwd->regs = devm_ioremap_resource(&pdev->dev, regs_resource);
+       hlwd->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(hlwd->regs))
                return PTR_ERR(hlwd->regs);