Skip to content

Commit 6c4cdf4

Browse files
Wu Botsbogend
authored andcommitted
bus: bt1-apb: change to use devm_clk_get_enabled() helper
Use devm_clk_get_enabled() instead of devm_clk_get() to make the code cleaner and avoid calling clk_disable_unprepare() Signed-off-by: Wu Bo <[email protected]> Acked-by: Serge Semin <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 854527e commit 6c4cdf4

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

drivers/bus/bt1-apb.c

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -185,34 +185,13 @@ static int bt1_apb_request_rst(struct bt1_apb *apb)
185185
return ret;
186186
}
187187

188-
static void bt1_apb_disable_clk(void *data)
189-
{
190-
struct bt1_apb *apb = data;
191-
192-
clk_disable_unprepare(apb->pclk);
193-
}
194-
195188
static int bt1_apb_request_clk(struct bt1_apb *apb)
196189
{
197-
int ret;
198-
199-
apb->pclk = devm_clk_get(apb->dev, "pclk");
190+
apb->pclk = devm_clk_get_enabled(apb->dev, "pclk");
200191
if (IS_ERR(apb->pclk))
201192
return dev_err_probe(apb->dev, PTR_ERR(apb->pclk),
202193
"Couldn't get APB clock descriptor\n");
203194

204-
ret = clk_prepare_enable(apb->pclk);
205-
if (ret) {
206-
dev_err(apb->dev, "Couldn't enable the APB clock\n");
207-
return ret;
208-
}
209-
210-
ret = devm_add_action_or_reset(apb->dev, bt1_apb_disable_clk, apb);
211-
if (ret) {
212-
dev_err(apb->dev, "Can't add APB EHB clocks disable action\n");
213-
return ret;
214-
}
215-
216195
apb->rate = clk_get_rate(apb->pclk);
217196
if (!apb->rate) {
218197
dev_err(apb->dev, "Invalid clock rate\n");

0 commit comments

Comments
 (0)