summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2019-03-10 23:27:35 -0700
committerBartosz Golaszewski <bgolaszewski@baylibre.com>2019-03-18 08:58:45 +0100
commitfc57949cfd1f1060a6154e45ebeeb80ac85bd499 (patch)
tree6dfd705ce00488c571d5ce1676491209db50252f /drivers/gpio
parentdb9ed63ca510ecb3df0b4fec170830a96017b7d1 (diff)
downloadlinux-fc57949cfd1f1060a6154e45ebeeb80ac85bd499.tar.gz
linux-fc57949cfd1f1060a6154e45ebeeb80ac85bd499.tar.bz2
linux-fc57949cfd1f1060a6154e45ebeeb80ac85bd499.zip
gpio: vf610: Use devres to disable clk_gpio
Clk_gpio 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() 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>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-vf610.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index 78c1f8ebbe8f..f7445468677d 100644
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -289,6 +289,10 @@ static int vf610_gpio_probe(struct platform_device *pdev)
ret = clk_prepare_enable(port->clk_gpio);
if (ret)
return ret;
+ ret = devm_add_action_or_reset(dev, vf610_gpio_disable_clk,
+ port->clk_gpio);
+ if (ret)
+ return ret;
} else if (port->clk_gpio == ERR_PTR(-EPROBE_DEFER)) {
return PTR_ERR(port->clk_gpio);
}
@@ -345,8 +349,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_gpio))
- clk_disable_unprepare(port->clk_gpio);
return 0;
}