Skip to content

Commit 55e644b

Browse files
Uwe Kleine-Königthierryreding
authored andcommitted
pwm: sifive: Simplify using devm_clk_get_prepared()
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> Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
1 parent 2b8e30b commit 55e644b

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

drivers/pwm/pwm-sifive.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,12 @@ static int pwm_sifive_probe(struct platform_device *pdev)
244244
if (IS_ERR(ddata->regs))
245245
return PTR_ERR(ddata->regs);
246246

247-
ddata->clk = devm_clk_get(dev, NULL);
247+
ddata->clk = devm_clk_get_prepared(dev, NULL);
248248
if (IS_ERR(ddata->clk))
249249
return dev_err_probe(dev, PTR_ERR(ddata->clk),
250250
"Unable to find controller clock\n");
251251

252-
ret = clk_prepare_enable(ddata->clk);
252+
ret = clk_enable(ddata->clk);
253253
if (ret) {
254254
dev_err(dev, "failed to enable clock for pwm: %d\n", ret);
255255
return ret;
@@ -308,7 +308,6 @@ static int pwm_sifive_probe(struct platform_device *pdev)
308308
clk_disable(ddata->clk);
309309
--enabled_clks;
310310
}
311-
clk_unprepare(ddata->clk);
312311

313312
return ret;
314313
}
@@ -327,8 +326,6 @@ static void pwm_sifive_remove(struct platform_device *dev)
327326
if (pwm->state.enabled)
328327
clk_disable(ddata->clk);
329328
}
330-
331-
clk_unprepare(ddata->clk);
332329
}
333330

334331
static const struct of_device_id pwm_sifive_of_match[] = {

0 commit comments

Comments
 (0)