Skip to content

Commit 854527e

Browse files
Wu Botsbogend
authored andcommitted
bus: bt1-axi: 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 58f28a2 commit 854527e

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

drivers/bus/bt1-axi.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,33 +146,14 @@ static int bt1_axi_request_rst(struct bt1_axi *axi)
146146
return ret;
147147
}
148148

149-
static void bt1_axi_disable_clk(void *data)
150-
{
151-
struct bt1_axi *axi = data;
152-
153-
clk_disable_unprepare(axi->aclk);
154-
}
155-
156149
static int bt1_axi_request_clk(struct bt1_axi *axi)
157150
{
158-
int ret;
159-
160-
axi->aclk = devm_clk_get(axi->dev, "aclk");
151+
axi->aclk = devm_clk_get_enabled(axi->dev, "aclk");
161152
if (IS_ERR(axi->aclk))
162153
return dev_err_probe(axi->dev, PTR_ERR(axi->aclk),
163154
"Couldn't get AXI Interconnect clock\n");
164155

165-
ret = clk_prepare_enable(axi->aclk);
166-
if (ret) {
167-
dev_err(axi->dev, "Couldn't enable the AXI clock\n");
168-
return ret;
169-
}
170-
171-
ret = devm_add_action_or_reset(axi->dev, bt1_axi_disable_clk, axi);
172-
if (ret)
173-
dev_err(axi->dev, "Can't add AXI clock disable action\n");
174-
175-
return ret;
156+
return 0;
176157
}
177158

178159
static int bt1_axi_request_irq(struct bt1_axi *axi)

0 commit comments

Comments
 (0)