mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
reset: meson-audio-arb: Use devm_clk_get_enabled()
Use devm_clk_get_enabled() to reduce a bit of boilerplate and to disable the clock in case devm_reset_controller_register() fails. Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20240621-reset-devm-clk-get-enabled-v1-1-8408c7962b6c@pengutronix.de Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
parent
1359fc272b
commit
0e8b3bca28
|
|
@ -129,8 +129,6 @@ static int meson_audio_arb_remove(struct platform_device *pdev)
|
|||
writel(0, arb->regs);
|
||||
spin_unlock(&arb->lock);
|
||||
|
||||
clk_disable_unprepare(arb->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -150,7 +148,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
platform_set_drvdata(pdev, arb);
|
||||
|
||||
arb->clk = devm_clk_get(dev, NULL);
|
||||
arb->clk = devm_clk_get_enabled(dev, NULL);
|
||||
if (IS_ERR(arb->clk))
|
||||
return dev_err_probe(dev, PTR_ERR(arb->clk), "failed to get clock\n");
|
||||
|
||||
|
|
@ -170,11 +168,6 @@ static int meson_audio_arb_probe(struct platform_device *pdev)
|
|||
* In the initial state, all memory interfaces are disabled
|
||||
* and the general bit is on
|
||||
*/
|
||||
ret = clk_prepare_enable(arb->clk);
|
||||
if (ret) {
|
||||
dev_err(dev, "failed to enable arb clock\n");
|
||||
return ret;
|
||||
}
|
||||
writel(BIT(ARB_GENERAL_BIT), arb->regs);
|
||||
|
||||
/* Register reset controller */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user