Merge tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-nomadik.c

diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index dd9e6f26416da777dfb66231aca0c9f86bade9a0..53b0d49a7a1c817a7316fc25e57fff3a5c5341bb 100644 (file)
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -434,7 +434,7 @@ static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep)
 /**
  * nmk_config_pin - configure a pin's mux attributes
  * @cfg: pin confguration
- *
+ * @sleep: Non-zero to apply the sleep mode configuration
  * Configures a pin's mode (alternate function or GPIO), its pull up status,
  * and its sleep mode based on the specified configuration.  The @cfg is
  * usually one of the SoC specific macros defined in mach/<soc>-pins.h.  These
@@ -1194,7 +1194,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
        }
 
        if (np) {
-               pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+               pdata = devm_kzalloc(&dev->dev, sizeof(*pdata), GFP_KERNEL);
                if (!pdata)
                        return -ENOMEM;
 
@@ -1229,29 +1229,23 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
                goto out;
        }
 
-       if (request_mem_region(res->start, resource_size(res),
-                              dev_name(&dev->dev)) == NULL) {
-               ret = -EBUSY;
-               goto out;
-       }
-
-       base = ioremap(res->start, resource_size(res));
+       base = devm_request_and_ioremap(&dev->dev, res);
        if (!base) {
                ret = -ENOMEM;
-               goto out_release;
+               goto out;
        }
 
-       clk = clk_get(&dev->dev, NULL);
+       clk = devm_clk_get(&dev->dev, NULL);
        if (IS_ERR(clk)) {
                ret = PTR_ERR(clk);
-               goto out_unmap;
+               goto out;
        }
        clk_prepare(clk);
 
-       nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
+       nmk_chip = devm_kzalloc(&dev->dev, sizeof(*nmk_chip), GFP_KERNEL);
        if (!nmk_chip) {
                ret = -ENOMEM;
-               goto out_clk;
+               goto out;
        }
 
        /*
@@ -1286,7 +1280,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 
        ret = gpiochip_add(&nmk_chip->chip);
        if (ret)
-               goto out_free;
+               goto out;
 
        BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));
 
@@ -1300,7 +1294,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
        if (!nmk_chip->domain) {
                pr_err("%s: Failed to create irqdomain\n", np->full_name);
                ret = -ENOSYS;
-               goto out_free;
+               goto out;
        }
 
        nmk_gpio_init_irq(nmk_chip);
@@ -1309,20 +1303,9 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 
        return 0;
 
-out_free:
-       kfree(nmk_chip);
-out_clk:
-       clk_disable(clk);
-       clk_put(clk);
-out_unmap:
-       iounmap(base);
-out_release:
-       release_mem_region(res->start, resource_size(res));
 out:
        dev_err(&dev->dev, "Failure %i for GPIO %i-%i\n", ret,
                  pdata->first_gpio, pdata->first_gpio+31);
-       if (np)
-               kfree(pdata);
 
        return ret;
 }