* [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared()
@ 2023-04-18 20:21 Uwe Kleine-König
2023-04-20 10:10 ` Emil Renner Berthing
2023-06-23 14:51 ` Thierry Reding
0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2023-04-18 20:21 UTC (permalink / raw)
To: Palmer Dabbelt, Paul Walmsley, Thierry Reding
Cc: linux-pwm, linux-riscv, kernel
Instead of preparing the clk after it was requested and unpreparing in
.probe()'s error path and .remove(), use devm_clk_get_prepared() which
copes for unpreparing automatically.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/pwm/pwm-sifive.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
index 5b0574f635f6..ae49d67ab2b1 100644
--- a/drivers/pwm/pwm-sifive.c
+++ b/drivers/pwm/pwm-sifive.c
@@ -244,12 +244,12 @@ static int pwm_sifive_probe(struct platform_device *pdev)
if (IS_ERR(ddata->regs))
return PTR_ERR(ddata->regs);
- ddata->clk = devm_clk_get(dev, NULL);
+ ddata->clk = devm_clk_get_prepared(dev, NULL);
if (IS_ERR(ddata->clk))
return dev_err_probe(dev, PTR_ERR(ddata->clk),
"Unable to find controller clock\n");
- ret = clk_prepare_enable(ddata->clk);
+ ret = clk_enable(ddata->clk);
if (ret) {
dev_err(dev, "failed to enable clock for pwm: %d\n", ret);
return ret;
@@ -308,7 +308,6 @@ static int pwm_sifive_probe(struct platform_device *pdev)
clk_disable(ddata->clk);
--enabled_clks;
}
- clk_unprepare(ddata->clk);
return ret;
}
@@ -327,8 +326,6 @@ static void pwm_sifive_remove(struct platform_device *dev)
if (pwm->state.enabled)
clk_disable(ddata->clk);
}
-
- clk_unprepare(ddata->clk);
}
static const struct of_device_id pwm_sifive_of_match[] = {
base-commit: 247ee6c780406513c6031a7f4ea41f1648b03295
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared()
2023-04-18 20:21 [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared() Uwe Kleine-König
@ 2023-04-20 10:10 ` Emil Renner Berthing
2023-06-23 14:51 ` Thierry Reding
1 sibling, 0 replies; 3+ messages in thread
From: Emil Renner Berthing @ 2023-04-20 10:10 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Palmer Dabbelt, Paul Walmsley, Thierry Reding, linux-pwm,
linux-riscv, kernel
On Tue, 18 Apr 2023 at 22:23, Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
>
> Instead of preparing the clk after it was requested and unpreparing in
> .probe()'s error path and .remove(), use devm_clk_get_prepared() which
> copes for unpreparing automatically.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Looks good to me, thanks.
Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
> ---
> drivers/pwm/pwm-sifive.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c
> index 5b0574f635f6..ae49d67ab2b1 100644
> --- a/drivers/pwm/pwm-sifive.c
> +++ b/drivers/pwm/pwm-sifive.c
> @@ -244,12 +244,12 @@ static int pwm_sifive_probe(struct platform_device *pdev)
> if (IS_ERR(ddata->regs))
> return PTR_ERR(ddata->regs);
>
> - ddata->clk = devm_clk_get(dev, NULL);
> + ddata->clk = devm_clk_get_prepared(dev, NULL);
> if (IS_ERR(ddata->clk))
> return dev_err_probe(dev, PTR_ERR(ddata->clk),
> "Unable to find controller clock\n");
>
> - ret = clk_prepare_enable(ddata->clk);
> + ret = clk_enable(ddata->clk);
> if (ret) {
> dev_err(dev, "failed to enable clock for pwm: %d\n", ret);
> return ret;
> @@ -308,7 +308,6 @@ static int pwm_sifive_probe(struct platform_device *pdev)
> clk_disable(ddata->clk);
> --enabled_clks;
> }
> - clk_unprepare(ddata->clk);
>
> return ret;
> }
> @@ -327,8 +326,6 @@ static void pwm_sifive_remove(struct platform_device *dev)
> if (pwm->state.enabled)
> clk_disable(ddata->clk);
> }
> -
> - clk_unprepare(ddata->clk);
> }
>
> static const struct of_device_id pwm_sifive_of_match[] = {
>
> base-commit: 247ee6c780406513c6031a7f4ea41f1648b03295
> --
> 2.39.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared()
2023-04-18 20:21 [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared() Uwe Kleine-König
2023-04-20 10:10 ` Emil Renner Berthing
@ 2023-06-23 14:51 ` Thierry Reding
1 sibling, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2023-06-23 14:51 UTC (permalink / raw)
To: Palmer Dabbelt, Paul Walmsley, Uwe Kleine-König
Cc: linux-pwm, linux-riscv, kernel
On Tue, 18 Apr 2023 22:21:02 +0200, Uwe Kleine-König wrote:
> Instead of preparing the clk after it was requested and unpreparing in
> .probe()'s error path and .remove(), use devm_clk_get_prepared() which
> copes for unpreparing automatically.
>
>
Applied, thanks!
[1/1] pwm: sifive: Simplify using devm_clk_get_prepared()
commit: 55e644b840baf7a884a27be81b7582794f54a808
Best regards,
--
Thierry Reding <thierry.reding@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-23 14:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18 20:21 [PATCH] pwm: sifive: Simplify using devm_clk_get_prepared() Uwe Kleine-König
2023-04-20 10:10 ` Emil Renner Berthing
2023-06-23 14:51 ` Thierry Reding
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).