* [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper
@ 2022-12-31 8:10 Christophe JAILLET
2022-12-31 16:49 ` Florian Fainelli
2022-12-31 19:29 ` Guenter Roeck
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2022-12-31 8:10 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Florian Fainelli,
Broadcom internal kernel review list
Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
linux-watchdog, linux-arm-kernel
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper
2022-12-31 8:10 [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper Christophe JAILLET
@ 2022-12-31 16:49 ` Florian Fainelli
2022-12-31 19:29 ` Guenter Roeck
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2022-12-31 16:49 UTC (permalink / raw)
To: Christophe JAILLET, Wim Van Sebroeck, Guenter Roeck,
Broadcom internal kernel review list
Cc: linux-kernel, kernel-janitors, linux-watchdog, linux-arm-kernel
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>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper
2022-12-31 8:10 [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper Christophe JAILLET
2022-12-31 16:49 ` Florian Fainelli
@ 2022-12-31 19:29 ` Guenter Roeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2022-12-31 19:29 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Wim Van Sebroeck, Florian Fainelli,
Broadcom internal kernel review list, linux-kernel,
kernel-janitors, linux-watchdog, linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-31 19:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-31 8:10 [PATCH] watchdog: bcm7038: Use devm_clk_get_enabled() helper Christophe JAILLET
2022-12-31 16:49 ` Florian Fainelli
2022-12-31 19:29 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).