Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-janz-ttl.c

diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 2ecd3a09c743e6dba7434c9cbfab0e5c70bc24c3..42852eaaf0200a43320ac946db793939e162ff50 100644 (file)
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -152,34 +152,21 @@ static int ttl_probe(struct platform_device *pdev)
        pdata = dev_get_platdata(&pdev->dev);
        if (!pdata) {
                dev_err(dev, "no platform data\n");
-               ret = -ENXIO;
-               goto out_return;
+               return -ENXIO;
        }
 
-       mod = kzalloc(sizeof(*mod), GFP_KERNEL);
-       if (!mod) {
-               dev_err(dev, "unable to allocate private data\n");
-               ret = -ENOMEM;
-               goto out_return;
-       }
+       mod = devm_kzalloc(dev, sizeof(*mod), GFP_KERNEL);
+       if (!mod)
+               return -ENOMEM;
 
        platform_set_drvdata(pdev, mod);
        spin_lock_init(&mod->lock);
 
        /* get access to the MODULbus registers for this module */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(dev, "MODULbus registers not found\n");
-               ret = -ENODEV;
-               goto out_free_mod;
-       }
-
-       mod->regs = ioremap(res->start, resource_size(res));
-       if (!mod->regs) {
-               dev_err(dev, "MODULbus registers not ioremap\n");
-               ret = -ENOMEM;
-               goto out_free_mod;
-       }
+       mod->regs = devm_ioremap_resource(dev, res);
+       if (IS_ERR(mod->regs))
+               return PTR_ERR(mod->regs);
 
        ttl_setup_device(mod);
 
@@ -198,17 +185,10 @@ static int ttl_probe(struct platform_device *pdev)
        ret = gpiochip_add(gpio);
        if (ret) {
                dev_err(dev, "unable to add GPIO chip\n");
-               goto out_iounmap_regs;
+               return ret;
        }
 
        return 0;
-
-out_iounmap_regs:
-       iounmap(mod->regs);
-out_free_mod:
-       kfree(mod);
-out_return:
-       return ret;
 }
 
 static int ttl_remove(struct platform_device *pdev)
@@ -223,8 +203,6 @@ static int ttl_remove(struct platform_device *pdev)
                return ret;
        }
 
-       iounmap(mod->regs);
-       kfree(mod);
        return 0;
 }