gpio: pca953x: use managed resources

Using the devm_* managed resources the pca driver can be simplified
and cut down on boilerplate code.

[gcl: fixed a inccorect reference to a removed label, "goto fail_out"
became "return ret"]

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 1dc99062eb144df55cd04c6425da1396e8067261..24059462c87fb23f6481304ae8d1bf819c2785e4 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -560,7 +560,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
                }
                ret = pca953x_read_regs(chip, offset, chip->irq_stat);
                if (ret)
-                       goto out_failed;
+                       return ret;
 
                /*
                 * There is no way to know which GPIO line generated the
@@ -579,7 +579,8 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
                if (!chip->domain)
                        return -ENODEV;
 
-               ret = request_threaded_irq(client->irq,
+               ret = devm_request_threaded_irq(&client->dev,
+                                       client->irq,
                                           NULL,
                                           pca953x_irq_handler,
                                           IRQF_TRIGGER_LOW | IRQF_ONESHOT,
@@ -596,12 +597,6 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
        return 0;
 }
 
-static void pca953x_irq_teardown(struct pca953x_chip *chip)
-{
-       if (chip->irq_base != -1) {
-               free_irq(chip->client->irq, chip);
-       }
-}
 #else /* CONFIG_GPIO_PCA953X_IRQ */
 static int pca953x_irq_setup(struct pca953x_chip *chip,
                             const struct i2c_device_id *id,
@@ -614,10 +609,6 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 
        return 0;
 }
-
-static void pca953x_irq_teardown(struct pca953x_chip *chip)
-{
-}
 #endif
 
 /*
@@ -736,7 +727,8 @@ static int pca953x_probe(struct i2c_client *client,
        int ret;
        u32 invert = 0;
 
-       chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
+       chip = devm_kzalloc(&client->dev,
+                       sizeof(struct pca953x_chip), GFP_KERNEL);
        if (chip == NULL)
                return -ENOMEM;
 
@@ -771,15 +763,15 @@ static int pca953x_probe(struct i2c_client *client,
        else
                ret = device_pca957x_init(chip, invert);
        if (ret)
-               goto out_failed;
+               return ret;
 
        ret = pca953x_irq_setup(chip, id, irq_base);
        if (ret)
-               goto out_failed;
+               return ret;
 
        ret = gpiochip_add(&chip->gpio_chip);
        if (ret)
-               goto out_failed_irq;
+               return ret;
 
        if (pdata && pdata->setup) {
                ret = pdata->setup(client, chip->gpio_chip.base,
@@ -790,12 +782,6 @@ static int pca953x_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, chip);
        return 0;
-
-out_failed_irq:
-       pca953x_irq_teardown(chip);
-out_failed:
-       kfree(chip);
-       return ret;
 }
 
 static int pca953x_remove(struct i2c_client *client)
@@ -821,8 +807,6 @@ static int pca953x_remove(struct i2c_client *client)
                return ret;
        }
 
-       pca953x_irq_teardown(chip);
-       kfree(chip);
        return 0;
 }