| Message ID | 9c055911e9f557b7239000c8e6cfa0cc393a19e9.1672474203.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: bcm7038: Use devm_clk_get_enabled() helper | expand |
On 12/31/2022 12:10 AM, 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> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
On Sat, Dec 31, 2022 at 09:10:17AM +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/bcm7038_wdt.c | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c > index 9388838899ac..e038dd66b819 100644 > --- a/drivers/watchdog/bcm7038_wdt.c > +++ b/drivers/watchdog/bcm7038_wdt.c > @@ -127,11 +127,6 @@ static const struct watchdog_ops bcm7038_wdt_ops = { > .get_timeleft = bcm7038_wdt_get_timeleft, > }; > > -static void bcm7038_clk_disable_unprepare(void *data) > -{ > - clk_disable_unprepare(data); > -} > - > static int bcm7038_wdt_probe(struct platform_device *pdev) > { > struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; > @@ -153,17 +148,9 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) > if (pdata && pdata->clk_name) > clk_name = pdata->clk_name; > > - wdt->clk = devm_clk_get(dev, clk_name); > + wdt->clk = devm_clk_get_enabled(dev, clk_name); > /* If unable to get clock, use default frequency */ > if (!IS_ERR(wdt->clk)) { > - err = clk_prepare_enable(wdt->clk); > - if (err) > - return err; > - err = devm_add_action_or_reset(dev, > - bcm7038_clk_disable_unprepare, > - wdt->clk); > - if (err) > - return err; > wdt->rate = clk_get_rate(wdt->clk); > /* Prevent divide-by-zero exception */ > if (!wdt->rate) > -- > 2.34.1 >
diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index 9388838899ac..e038dd66b819 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -127,11 +127,6 @@ static const struct watchdog_ops bcm7038_wdt_ops = { .get_timeleft = bcm7038_wdt_get_timeleft, }; -static void bcm7038_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int bcm7038_wdt_probe(struct platform_device *pdev) { struct bcm7038_wdt_platform_data *pdata = pdev->dev.platform_data; @@ -153,17 +148,9 @@ static int bcm7038_wdt_probe(struct platform_device *pdev) if (pdata && pdata->clk_name) clk_name = pdata->clk_name; - wdt->clk = devm_clk_get(dev, clk_name); + wdt->clk = devm_clk_get_enabled(dev, clk_name); /* If unable to get clock, use default frequency */ if (!IS_ERR(wdt->clk)) { - err = clk_prepare_enable(wdt->clk); - if (err) - return err; - err = devm_add_action_or_reset(dev, - bcm7038_clk_disable_unprepare, - wdt->clk); - if (err) - return err; wdt->rate = clk_get_rate(wdt->clk); /* Prevent divide-by-zero exception */ if (!wdt->rate)
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/bcm7038_wdt.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)