Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+1
-8
+1
-8
drivers/reset/reset-meson-audio-arb.c
+1
-8
drivers/reset/reset-meson-audio-arb.c
···
129
129
writel(0, arb->regs);
130
130
spin_unlock(&arb->lock);
131
131
132
-
clk_disable_unprepare(arb->clk);
133
-
134
132
return 0;
135
133
}
136
134
···
148
150
return -ENOMEM;
149
151
platform_set_drvdata(pdev, arb);
150
152
151
-
arb->clk = devm_clk_get(dev, NULL);
153
+
arb->clk = devm_clk_get_enabled(dev, NULL);
152
154
if (IS_ERR(arb->clk))
153
155
return dev_err_probe(dev, PTR_ERR(arb->clk), "failed to get clock\n");
154
156
···
168
170
* In the initial state, all memory interfaces are disabled
169
171
* and the general bit is on
170
172
*/
171
-
ret = clk_prepare_enable(arb->clk);
172
-
if (ret) {
173
-
dev_err(dev, "failed to enable arb clock\n");
174
-
return ret;
175
-
}
176
173
writel(BIT(ARB_GENERAL_BIT), arb->regs);
177
174
178
175
/* Register reset controller */