Skip to content

Commit 10c3937

Browse files
Li Zetaobroonie
authored andcommitted
spi: dw-bt1: Use helper function devm_clk_get_enabled()
Since commit 7ef9651 ("clk: Provide new devm_clk helpers for prepared and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be replaced by devm_clk_get_enabled() when driver enables (and possibly prepares) the clocks for the whole lifetime of the device. Moreover, it is no longer necessary to unprepare and disable the clocks explicitly. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Serge Semin <fancer.lancer@gmail.com> Signed-off-by: Li Zetao <lizetao1@huawei.com> Link: https://lore.kernel.org/r/20230823133938.1359106-12-lizetao1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 9dc2aa9 commit 10c3937

1 file changed

Lines changed: 5 additions & 18 deletions

File tree

drivers/spi/spi-dw-bt1.c

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -269,43 +269,32 @@ static int dw_spi_bt1_probe(struct platform_device *pdev)
269269

270270
dws->paddr = mem->start;
271271

272-
dwsbt1->clk = devm_clk_get(&pdev->dev, NULL);
272+
dwsbt1->clk = devm_clk_get_enabled(&pdev->dev, NULL);
273273
if (IS_ERR(dwsbt1->clk))
274274
return PTR_ERR(dwsbt1->clk);
275275

276-
ret = clk_prepare_enable(dwsbt1->clk);
277-
if (ret)
278-
return ret;
279-
280276
dws->bus_num = pdev->id;
281277
dws->reg_io_width = 4;
282278
dws->max_freq = clk_get_rate(dwsbt1->clk);
283-
if (!dws->max_freq) {
284-
ret = -EINVAL;
285-
goto err_disable_clk;
286-
}
279+
if (!dws->max_freq)
280+
return -EINVAL;
287281

288282
init_func = device_get_match_data(&pdev->dev);
289283
ret = init_func(pdev, dwsbt1);
290284
if (ret)
291-
goto err_disable_clk;
285+
return ret;
292286

293287
pm_runtime_enable(&pdev->dev);
294288

295289
ret = dw_spi_add_host(&pdev->dev, dws);
296290
if (ret) {
297291
pm_runtime_disable(&pdev->dev);
298-
goto err_disable_clk;
292+
return ret;
299293
}
300294

301295
platform_set_drvdata(pdev, dwsbt1);
302296

303297
return 0;
304-
305-
err_disable_clk:
306-
clk_disable_unprepare(dwsbt1->clk);
307-
308-
return ret;
309298
}
310299

311300
static void dw_spi_bt1_remove(struct platform_device *pdev)
@@ -315,8 +304,6 @@ static void dw_spi_bt1_remove(struct platform_device *pdev)
315304
dw_spi_remove_host(&dwsbt1->dws);
316305

317306
pm_runtime_disable(&pdev->dev);
318-
319-
clk_disable_unprepare(dwsbt1->clk);
320307
}
321308

322309
static const struct of_device_id dw_spi_bt1_of_match[] = {

0 commit comments

Comments
 (0)