Skip to content

Commit 07d4116

Browse files
tititiou36Wim Van Sebroeck
authored andcommitted
watchdog: loongson1: Use devm_clk_get_enabled() helper
The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids the need of a dedicated function used with devm_add_action_or_reset(). Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/624106aa86ef7e49f16b11b229528eabd63de8f7.1672485257.git.christophe.jaillet@wanadoo.fr Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 8fd15ac commit 07d4116

1 file changed

Lines changed: 1 addition & 16 deletions

File tree

drivers/watchdog/loongson1_wdt.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ static const struct watchdog_ops ls1x_wdt_ops = {
7979
.set_timeout = ls1x_wdt_set_timeout,
8080
};
8181

82-
static void ls1x_clk_disable_unprepare(void *data)
83-
{
84-
clk_disable_unprepare(data);
85-
}
86-
8782
static int ls1x_wdt_probe(struct platform_device *pdev)
8883
{
8984
struct device *dev = &pdev->dev;
@@ -100,20 +95,10 @@ static int ls1x_wdt_probe(struct platform_device *pdev)
10095
if (IS_ERR(drvdata->base))
10196
return PTR_ERR(drvdata->base);
10297

103-
drvdata->clk = devm_clk_get(dev, pdev->name);
98+
drvdata->clk = devm_clk_get_enabled(dev, pdev->name);
10499
if (IS_ERR(drvdata->clk))
105100
return PTR_ERR(drvdata->clk);
106101

107-
err = clk_prepare_enable(drvdata->clk);
108-
if (err) {
109-
dev_err(dev, "clk enable failed\n");
110-
return err;
111-
}
112-
err = devm_add_action_or_reset(dev, ls1x_clk_disable_unprepare,
113-
drvdata->clk);
114-
if (err)
115-
return err;
116-
117102
clk_rate = clk_get_rate(drvdata->clk);
118103
if (!clk_rate)
119104
return -EINVAL;

0 commit comments

Comments
 (0)