Commit 98b7a161 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Wim Van Sebroeck
Browse files

watchdog: apple: Use devm_clk_get_enabled() helper 



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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarSven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/6f312af6160d1e10b616c9adbd1fd8f822db964d.1672473415.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 8c5210db

drivers/watchdog/apple_wdt.c

+1 −17
Original line number Diff line number Diff line
@@ -136,11 +136,6 @@ static int apple_wdt_restart(struct watchdog_device *wdd, unsigned long mode, 
	return 0;

}



static void apple_wdt_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static struct watchdog_ops apple_wdt_ops = {

	.owner = THIS_MODULE,

	.start = apple_wdt_start,
@@ -162,7 +157,6 @@ static int apple_wdt_probe(struct platform_device *pdev) 
	struct apple_wdt *wdt;

	struct clk *clk;

	u32 wdt_ctrl;

	int ret;



	wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);

	if (!wdt)
@@ -172,19 +166,9 @@ static int apple_wdt_probe(struct platform_device *pdev) 
	if (IS_ERR(wdt->regs))

		return PTR_ERR(wdt->regs);



	clk = devm_clk_get(dev, NULL);

	clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	ret = clk_prepare_enable(clk);

	if (ret)

		return ret;



	ret = devm_add_action_or_reset(dev, apple_wdt_clk_disable_unprepare,

				       clk);

	if (ret)

		return ret;



	wdt->clk_rate = clk_get_rate(clk);

	if (!wdt->clk_rate)

		return -EINVAL;