On Sat, Dec 31, 2022 at 12:07:27PM +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@xxxxxxxxxx>
> ---
> Note that I get a compilation error because read_cpuid_id() is not defined
> on my system (x86_64).
> So I think that a "depends on ARM<something>" in missing in a KConfig file.
It has
depends on ARCH_IXP4XX
and CONFIG_IXP4XX_WATCHDOG is not set for me after "make allmodconfig".
>
> Fixing it could help compilation farms build-bots.
Mine doesn't see a problem, and I don't recall ever being alerted about
one. What am I missing ? Do you see a problem reported anywhere ?
Guenter
> ---
> drivers/watchdog/ixp4xx_wdt.c | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
> index 281a48d9889f..607ce4b8df57 100644
> --- a/drivers/watchdog/ixp4xx_wdt.c
> +++ b/drivers/watchdog/ixp4xx_wdt.c
> @@ -112,12 +112,6 @@ static const struct watchdog_info ixp4xx_wdt_info = {
> .identity = KBUILD_MODNAME,
> };
>
> -/* Devres-handled clock disablement */
> -static void ixp4xx_clock_action(void *d)
> -{
> - clk_disable_unprepare(d);
> -}
> -
> static int ixp4xx_wdt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -139,16 +133,10 @@ static int ixp4xx_wdt_probe(struct platform_device *pdev)
> * Retrieve rate from a fixed clock from the device tree if
> * the parent has that, else use the default clock rate.
> */
> - clk = devm_clk_get(dev->parent, NULL);
> - if (!IS_ERR(clk)) {
> - ret = clk_prepare_enable(clk);
> - if (ret)
> - return ret;
> - ret = devm_add_action_or_reset(dev, ixp4xx_clock_action, clk);
> - if (ret)
> - return ret;
> + clk = devm_clk_get_enabled(dev->parent, NULL);
> + if (!IS_ERR(clk))
> iwdt->rate = clk_get_rate(clk);
> - }
> +
> if (!iwdt->rate)
> iwdt->rate = IXP4XX_TIMER_FREQ;
>
> --
> 2.34.1
>
