| Message ID | 6a4cf8e8b9d8f555c77395ba2ecadc205553774d.1672483046.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers | show |
| Series | watchdog: davinci: Use devm_clk_get_enabled() helper | expand |
On Sat, Dec 31, 2022 at 11:37:39AM +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/davinci_wdt.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c > index 584a56893b81..5f2184bda7b2 100644 > --- a/drivers/watchdog/davinci_wdt.c > +++ b/drivers/watchdog/davinci_wdt.c > @@ -189,14 +189,8 @@ static const struct watchdog_ops davinci_wdt_ops = { > .restart = davinci_wdt_restart, > }; > > -static void davinci_clk_disable_unprepare(void *data) > -{ > - clk_disable_unprepare(data); > -} > - > static int davinci_wdt_probe(struct platform_device *pdev) > { > - int ret = 0; > struct device *dev = &pdev->dev; > struct watchdog_device *wdd; > struct davinci_wdt_device *davinci_wdt; > @@ -205,21 +199,11 @@ static int davinci_wdt_probe(struct platform_device *pdev) > if (!davinci_wdt) > return -ENOMEM; > > - davinci_wdt->clk = devm_clk_get(dev, NULL); > + davinci_wdt->clk = devm_clk_get_enabled(dev, NULL); > if (IS_ERR(davinci_wdt->clk)) > return dev_err_probe(dev, PTR_ERR(davinci_wdt->clk), > "failed to get clock node\n"); > > - ret = clk_prepare_enable(davinci_wdt->clk); > - if (ret) { > - dev_err(dev, "failed to prepare clock\n"); > - return ret; > - } > - ret = devm_add_action_or_reset(dev, davinci_clk_disable_unprepare, > - davinci_wdt->clk); > - if (ret) > - return ret; > - > platform_set_drvdata(pdev, davinci_wdt); > > wdd = &davinci_wdt->wdd; > -- > 2.34.1 >
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 584a56893b81..5f2184bda7b2 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -189,14 +189,8 @@ static const struct watchdog_ops davinci_wdt_ops = { .restart = davinci_wdt_restart, }; -static void davinci_clk_disable_unprepare(void *data) -{ - clk_disable_unprepare(data); -} - static int davinci_wdt_probe(struct platform_device *pdev) { - int ret = 0; struct device *dev = &pdev->dev; struct watchdog_device *wdd; struct davinci_wdt_device *davinci_wdt; @@ -205,21 +199,11 @@ static int davinci_wdt_probe(struct platform_device *pdev) if (!davinci_wdt) return -ENOMEM; - davinci_wdt->clk = devm_clk_get(dev, NULL); + davinci_wdt->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(davinci_wdt->clk)) return dev_err_probe(dev, PTR_ERR(davinci_wdt->clk), "failed to get clock node\n"); - ret = clk_prepare_enable(davinci_wdt->clk); - if (ret) { - dev_err(dev, "failed to prepare clock\n"); - return ret; - } - ret = devm_add_action_or_reset(dev, davinci_clk_disable_unprepare, - davinci_wdt->clk); - if (ret) - return ret; - platform_set_drvdata(pdev, davinci_wdt); wdd = &davinci_wdt->wdd;
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/davinci_wdt.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)