* [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper
@ 2022-12-31 12:34 Christophe JAILLET
2023-01-03 21:13 ` Guenter Roeck
2023-01-03 21:26 ` Martin Blumenstingl
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2022-12-31 12:34 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Neil Armstrong, Kevin Hilman,
Jerome Brunet, Martin Blumenstingl
Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
linux-watchdog, linux-arm-kernel, linux-amlogic
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/meson_gxbb_wdt.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
index 981a2f7c3bec..35d80cb39856 100644
--- a/drivers/watchdog/meson_gxbb_wdt.c
+++ b/drivers/watchdog/meson_gxbb_wdt.c
@@ -146,16 +146,10 @@ static const struct of_device_id meson_gxbb_wdt_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, meson_gxbb_wdt_dt_ids);
-static void meson_clk_disable_unprepare(void *data)
-{
- clk_disable_unprepare(data);
-}
-
static int meson_gxbb_wdt_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct meson_gxbb_wdt *data;
- int ret;
u32 ctrl_reg;
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -166,18 +160,10 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
if (IS_ERR(data->reg_base))
return PTR_ERR(data->reg_base);
- data->clk = devm_clk_get(dev, NULL);
+ data->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(data->clk))
return PTR_ERR(data->clk);
- ret = clk_prepare_enable(data->clk);
- if (ret)
- return ret;
- ret = devm_add_action_or_reset(dev, meson_clk_disable_unprepare,
- data->clk);
- if (ret)
- return ret;
-
platform_set_drvdata(pdev, data);
data->wdt_dev.parent = dev;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper
2022-12-31 12:34 [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper Christophe JAILLET
@ 2023-01-03 21:13 ` Guenter Roeck
2023-01-03 21:26 ` Martin Blumenstingl
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2023-01-03 21:13 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Wim Van Sebroeck, Neil Armstrong, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl, linux-kernel, kernel-janitors,
linux-watchdog, linux-arm-kernel, linux-amlogic
On Sat, Dec 31, 2022 at 01:34:44PM +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/meson_gxbb_wdt.c | 16 +---------------
> 1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
> index 981a2f7c3bec..35d80cb39856 100644
> --- a/drivers/watchdog/meson_gxbb_wdt.c
> +++ b/drivers/watchdog/meson_gxbb_wdt.c
> @@ -146,16 +146,10 @@ static const struct of_device_id meson_gxbb_wdt_dt_ids[] = {
> };
> MODULE_DEVICE_TABLE(of, meson_gxbb_wdt_dt_ids);
>
> -static void meson_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int meson_gxbb_wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct meson_gxbb_wdt *data;
> - int ret;
> u32 ctrl_reg;
>
> data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
> @@ -166,18 +160,10 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev)
> if (IS_ERR(data->reg_base))
> return PTR_ERR(data->reg_base);
>
> - data->clk = devm_clk_get(dev, NULL);
> + data->clk = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(data->clk))
> return PTR_ERR(data->clk);
>
> - ret = clk_prepare_enable(data->clk);
> - if (ret)
> - return ret;
> - ret = devm_add_action_or_reset(dev, meson_clk_disable_unprepare,
> - data->clk);
> - if (ret)
> - return ret;
> -
> platform_set_drvdata(pdev, data);
>
> data->wdt_dev.parent = dev;
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper
2022-12-31 12:34 [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper Christophe JAILLET
2023-01-03 21:13 ` Guenter Roeck
@ 2023-01-03 21:26 ` Martin Blumenstingl
1 sibling, 0 replies; 3+ messages in thread
From: Martin Blumenstingl @ 2023-01-03 21:26 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Wim Van Sebroeck, Guenter Roeck, Neil Armstrong, Kevin Hilman,
Jerome Brunet, linux-kernel, kernel-janitors, linux-watchdog,
linux-arm-kernel, linux-amlogic
On Sat, Dec 31, 2022 at 1:34 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> 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>
Thank you for this patch! It's:
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-03 21:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-31 12:34 [PATCH] watchdog: meson_gxbb: Use devm_clk_get_enabled() helper Christophe JAILLET
2023-01-03 21:13 ` Guenter Roeck
2023-01-03 21:26 ` Martin Blumenstingl
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).