gpio: vf610: Use devres to disable clk_port

Clk_port should be disabled in all error paths in the code that
follws, including the case when either gpiochip_add_data() or
gpiochip_irqchip_add() fail. To simplify things fix this by using
devm_add_action_or_reset() to disable corresponding clock in case of
any erros as well as driver/device removal.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index bb35cedd05e30ea8ba9f0f7dc9a8eb3fa5ece88f..78c1f8ebbe8f5d7702c629a9bfc0d27505d3752f 100644 (file)
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -232,6 +232,11 @@ static int vf610_gpio_irq_set_wake(struct irq_data *d, u32 enable)
        return 0;
 }
 
+static void vf610_gpio_disable_clk(void *data)
+{
+       clk_disable_unprepare(data);
+}
+
 static int vf610_gpio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -267,6 +272,10 @@ static int vf610_gpio_probe(struct platform_device *pdev)
                ret = clk_prepare_enable(port->clk_port);
                if (ret)
                        return ret;
+               ret = devm_add_action_or_reset(dev, vf610_gpio_disable_clk,
+                                              port->clk_port);
+               if (ret)
+                       return ret;
        } else if (port->clk_port == ERR_PTR(-EPROBE_DEFER)) {
                /*
                 * Percolate deferrals, for anything else,
@@ -278,12 +287,9 @@ static int vf610_gpio_probe(struct platform_device *pdev)
        port->clk_gpio = devm_clk_get(&pdev->dev, "gpio");
        if (!IS_ERR(port->clk_gpio)) {
                ret = clk_prepare_enable(port->clk_gpio);
-               if (ret) {
-                       clk_disable_unprepare(port->clk_port);
+               if (ret)
                        return ret;
-               }
        } else if (port->clk_gpio == ERR_PTR(-EPROBE_DEFER)) {
-               clk_disable_unprepare(port->clk_port);
                return PTR_ERR(port->clk_gpio);
        }
 
@@ -339,8 +345,6 @@ static int vf610_gpio_remove(struct platform_device *pdev)
        struct vf610_gpio_port *port = platform_get_drvdata(pdev);
 
        gpiochip_remove(&port->gc);
-       if (!IS_ERR(port->clk_port))
-               clk_disable_unprepare(port->clk_port);
        if (!IS_ERR(port->clk_gpio))
                clk_disable_unprepare(port->clk_gpio);