On Sat, Dec 31, 2022 at 09:00:31AM +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>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/armada_37xx_wdt.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c
> index ac9fed1ef681..e58652939f8a 100644
> --- a/drivers/watchdog/armada_37xx_wdt.c
> +++ b/drivers/watchdog/armada_37xx_wdt.c
> @@ -246,11 +246,6 @@ static const struct watchdog_ops armada_37xx_wdt_ops = {
> .get_timeleft = armada_37xx_wdt_get_timeleft,
> };
>
> -static void armada_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int armada_37xx_wdt_probe(struct platform_device *pdev)
> {
> struct armada_37xx_watchdog *dev;
> @@ -280,18 +275,10 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> /* init clock */
> - dev->clk = devm_clk_get(&pdev->dev, NULL);
> + dev->clk = devm_clk_get_enabled(&pdev->dev, NULL);
> if (IS_ERR(dev->clk))
> return PTR_ERR(dev->clk);
>
> - ret = clk_prepare_enable(dev->clk);
> - if (ret)
> - return ret;
> - ret = devm_add_action_or_reset(&pdev->dev,
> - armada_clk_disable_unprepare, dev->clk);
> - if (ret)
> - return ret;
> -
> dev->clk_rate = clk_get_rate(dev->clk);
> if (!dev->clk_rate)
> return -EINVAL;
> --
> 2.34.1
>
