| Message ID | 6c5948373d309408095c1a098b7b4c491c5265f7.1672490071.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: meson_gxbb: Use devm_clk_get_enabled() helper | expand |
On Sat, Dec 31, 2022 at 01:34:44PM +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@wanadoo.fr> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/meson_gxbb_wdt.c | 16 +--------------- > 1 file changed, 1 insertion(+), 15 deletions(-) > > diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c > index 981a2f7c3bec..35d80cb39856 100644 > --- a/drivers/watchdog/meson_gxbb_wdt.c > +++ b/drivers/watchdog/meson_gxbb_wdt.c > @@ -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; > -- > 2.34.1 >
On Sat, Dec 31, 2022 at 1:34 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> 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@wanadoo.fr> Thank you for this patch! It's: Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index 981a2f7c3bec..35d80cb39856 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -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;
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@wanadoo.fr> --- drivers/watchdog/meson_gxbb_wdt.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)