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

watchdog: armada_37xx: 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>
Link: https://lore.kernel.org/r/ccb096879a1309b9918ae956d6bdb9668c69bcda.1672473617.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 be80ae3d

drivers/watchdog/armada_37xx_wdt.c

+1 −14
Original line number Diff line number Diff line
@@ -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;