Skip to content

Commit ad1ded9

Browse files
microhobbydlezcano
authored andcommitted
clocksource/drivers/owl: Improve owl_timer_init fail messages
Check the return from clocksource_mmio_init, add messages in case of an error and in case of not having a defined clock property. Signed-off-by: Matheus Castello <matheus@castello.eng.br> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200219004810.411190-1-matheus@castello.eng.br
1 parent ca7b72b commit ad1ded9

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

drivers/clocksource/timer-owl.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,24 @@ static int __init owl_timer_init(struct device_node *node)
135135
}
136136

137137
clk = of_clk_get(node, 0);
138-
if (IS_ERR(clk))
139-
return PTR_ERR(clk);
138+
if (IS_ERR(clk)) {
139+
ret = PTR_ERR(clk);
140+
pr_err("Failed to get clock for clocksource (%d)\n", ret);
141+
return ret;
142+
}
140143

141144
rate = clk_get_rate(clk);
142145

143146
owl_timer_reset(owl_clksrc_base);
144147
owl_timer_set_enabled(owl_clksrc_base, true);
145148

146149
sched_clock_register(owl_timer_sched_read, 32, rate);
147-
clocksource_mmio_init(owl_clksrc_base + OWL_Tx_VAL, node->name,
148-
rate, 200, 32, clocksource_mmio_readl_up);
150+
ret = clocksource_mmio_init(owl_clksrc_base + OWL_Tx_VAL, node->name,
151+
rate, 200, 32, clocksource_mmio_readl_up);
152+
if (ret) {
153+
pr_err("Failed to register clocksource (%d)\n", ret);
154+
return ret;
155+
}
149156

150157
owl_timer_reset(owl_clkevt_base);
151158

0 commit comments

Comments
 (0)