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

watchdog: meson_gxbb: 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 avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/6c5948373d309408095c1a098b7b4c491c5265f7.1672490071.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 616a2fe3

drivers/watchdog/meson_gxbb_wdt.c

+1 −15
Original line number Diff line number Diff line
@@ -146,16 +146,10 @@ static const struct of_device_id meson_gxbb_wdt_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, meson_gxbb_wdt_dt_ids);



static void meson_clk_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static int meson_gxbb_wdt_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct meson_gxbb_wdt *data;

	int ret;

	u32 ctrl_reg;



	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -166,18 +160,10 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) 
	if (IS_ERR(data->reg_base))

		return PTR_ERR(data->reg_base);



	data->clk = devm_clk_get(dev, NULL);

	data->clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(data->clk))

		return PTR_ERR(data->clk);



	ret = clk_prepare_enable(data->clk);

	if (ret)

		return ret;

	ret = devm_add_action_or_reset(dev, meson_clk_disable_unprepare,

				       data->clk);

	if (ret)

		return ret;



	platform_set_drvdata(pdev, data);



	data->wdt_dev.parent = dev;