On Sat, Dec 31, 2022 at 03:20:29PM +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/pic32-dmt.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c
> index f43062b3c4c8..bc4ccddc75a3 100644
> --- a/drivers/watchdog/pic32-dmt.c
> +++ b/drivers/watchdog/pic32-dmt.c
> @@ -164,11 +164,6 @@ static struct watchdog_device pic32_dmt_wdd = {
> .ops = &pic32_dmt_fops,
> };
>
> -static void pic32_clk_disable_unprepare(void *data)
> -{
> - clk_disable_unprepare(data);
> -}
> -
> static int pic32_dmt_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -184,20 +179,12 @@ static int pic32_dmt_probe(struct platform_device *pdev)
> if (IS_ERR(dmt->regs))
> return PTR_ERR(dmt->regs);
>
> - dmt->clk = devm_clk_get(dev, NULL);
> + dmt->clk = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(dmt->clk)) {
> dev_err(dev, "clk not found\n");
> return PTR_ERR(dmt->clk);
> }
>
> - ret = clk_prepare_enable(dmt->clk);
> - if (ret)
> - return ret;
> - ret = devm_add_action_or_reset(dev, pic32_clk_disable_unprepare,
> - dmt->clk);
> - if (ret)
> - return ret;
> -
> wdd->timeout = pic32_dmt_get_timeout_secs(dmt);
> if (!wdd->timeout) {
> dev_err(dev, "failed to read watchdog register timeout\n");
> --
> 2.34.1
>
