| Message ID | b1f8b5453791035ad534bd5ed36b49798ff4d9b2.1672418166.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: rzn1: Use devm_clk_get_enabled() helper | expand |
On Fri, Dec 30, 2022 at 05:36:20PM +0100, Christophe JAILLET wrote: > 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> > --- > drivers/watchdog/rzn1_wdt.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/watchdog/rzn1_wdt.c b/drivers/watchdog/rzn1_wdt.c > index 55ab384b9965..980c1717adb5 100644 > --- a/drivers/watchdog/rzn1_wdt.c > +++ b/drivers/watchdog/rzn1_wdt.c > @@ -98,11 +98,6 @@ static const struct watchdog_ops rzn1_wdt_ops = { > .ping = rzn1_wdt_ping, > }; > > -static void rzn1_wdt_clk_disable_unprepare(void *data) > -{ > - clk_disable_unprepare(data); > -} > - > static int rzn1_wdt_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -132,23 +127,12 @@ static int rzn1_wdt_probe(struct platform_device *pdev) > return ret; > } > > - clk = devm_clk_get(dev, NULL); > + clk = devm_clk_get_enabled(dev, NULL); > if (IS_ERR(clk)) { > dev_err(dev, "failed to get the clock\n"); > return PTR_ERR(clk); > } > > - ret = clk_prepare_enable(clk); > - if (ret) { > - dev_err(dev, "failed to prepare/enable the clock\n"); > - return ret; > - } > - > - ret = devm_add_action_or_reset(dev, rzn1_wdt_clk_disable_unprepare, > - clk); > - if (ret) > - return ret; > - > clk_rate = clk_get_rate(clk); > if (!clk_rate) { > dev_err(dev, "failed to get the clock rate\n"); > -- > 2.34.1 >
diff --git a/drivers/watchdog/rzn1_wdt.c b/drivers/watchdog/rzn1_wdt.c index 55ab384b9965..980c1717adb5 100644 --- a/drivers/watchdog/rzn1_wdt.c +++ b/drivers/watchdog/rzn1_wdt.c @@ -98,11 +98,6 @@ static const struct watchdog_ops rzn1_wdt_ops = { .ping = rzn1_wdt_ping, }; -static void rzn1_wdt_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int rzn1_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -132,23 +127,12 @@ static int rzn1_wdt_probe(struct platform_device *pdev) return ret; } - clk = devm_clk_get(dev, NULL); + clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(clk)) { dev_err(dev, "failed to get the clock\n"); return PTR_ERR(clk); } - ret = clk_prepare_enable(clk); - if (ret) { - dev_err(dev, "failed to prepare/enable the clock\n"); - return ret; - } - - ret = devm_add_action_or_reset(dev, rzn1_wdt_clk_disable_unprepare, - clk); - if (ret) - return ret; - clk_rate = clk_get_rate(clk); if (!clk_rate) { dev_err(dev, "failed to get the clock rate\n");
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> --- drivers/watchdog/rzn1_wdt.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)