summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-stp-xway.c
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2019-07-03 00:32:46 +0200
committerLinus Walleij <linus.walleij@linaro.org>2019-07-04 09:39:42 +0200
commitbd791c48808a1f39a768a0096940d71e05bb0889 (patch)
tree6b611534d1e66ef64f4d96a34e212865081fb7c0 /drivers/gpio/gpio-stp-xway.c
parent8a7b179781e865ca2c7fe4ce9a7976f45c070f53 (diff)
downloadlinux-bd791c48808a1f39a768a0096940d71e05bb0889.tar.gz
linux-bd791c48808a1f39a768a0096940d71e05bb0889.tar.bz2
linux-bd791c48808a1f39a768a0096940d71e05bb0889.zip
gpio: stp-xway: improve module clock error handling
Three module clock error handling improvements: - use devm_clk_get() so the clock instance can be freed if devm_gpiochip_add_data() fails later on - switch to clk_prepare_enable() so the driver is ready whenever the lantiq target switches to the common clock framework - disable the clock again (using clk_disable_unprepare()) if devm_gpiochip_add_data() All of these are virtually no-ops with the current lantiq target. However, these will be relevant if we switch to the common clock framework. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://lore.kernel.org/r/20190702223248.31934-3-martin.blumenstingl@googlemail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-stp-xway.c')
-rw-r--r--drivers/gpio/gpio-stp-xway.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index 3606af901ace..cbdeba9144c1 100644
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -259,18 +259,23 @@ static int xway_stp_probe(struct platform_device *pdev)
if (!of_find_property(pdev->dev.of_node, "lantiq,rising", NULL))
chip->edge = XWAY_STP_FALLING;
- clk = clk_get(&pdev->dev, NULL);
+ clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "Failed to get clock\n");
return PTR_ERR(clk);
}
- clk_enable(clk);
+
+ ret = clk_prepare_enable(clk);
+ if (ret)
+ return ret;
xway_stp_hw_init(chip);
ret = devm_gpiochip_add_data(&pdev->dev, &chip->gc, chip);
- if (ret)
+ if (ret) {
+ clk_disable_unprepare(clk);
return ret;
+ }
dev_info(&pdev->dev, "Init done\n");