Commit 38d94c5a authored by Daniel Lezcano's avatar Daniel Lezcano

clocksource/drivers/stm32: Convert init function to return error

The init functions do not return any error. They behave as the following:

  - panic, thus leading to a kernel crash while another timer may work and
       make the system boot up correctly

  or

  - print an error and let the caller unaware if the state of the system

Change that by converting the init functions to return an error conforming
to the CLOCKSOURCE_OF_RET prototype.

Proper error handling (rollback, errno value) will be changed later case
by case, thus this change just return back an error or success in the init
function.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarMaxime Coquelin <mcoquelin.stm32@gmail.com>
parent 2ef2538b
...@@ -98,7 +98,7 @@ static struct stm32_clock_event_ddata clock_event_ddata = { ...@@ -98,7 +98,7 @@ static struct stm32_clock_event_ddata clock_event_ddata = {
}, },
}; };
static void __init stm32_clockevent_init(struct device_node *np) static int __init stm32_clockevent_init(struct device_node *np)
{ {
struct stm32_clock_event_ddata *data = &clock_event_ddata; struct stm32_clock_event_ddata *data = &clock_event_ddata;
struct clk *clk; struct clk *clk;
...@@ -130,12 +130,14 @@ static void __init stm32_clockevent_init(struct device_node *np) ...@@ -130,12 +130,14 @@ static void __init stm32_clockevent_init(struct device_node *np)
data->base = of_iomap(np, 0); data->base = of_iomap(np, 0);
if (!data->base) { if (!data->base) {
ret = -ENXIO;
pr_err("failed to map registers for clockevent\n"); pr_err("failed to map registers for clockevent\n");
goto err_iomap; goto err_iomap;
} }
irq = irq_of_parse_and_map(np, 0); irq = irq_of_parse_and_map(np, 0);
if (!irq) { if (!irq) {
ret = -EINVAL;
pr_err("%s: failed to get irq.\n", np->full_name); pr_err("%s: failed to get irq.\n", np->full_name);
goto err_get_irq; goto err_get_irq;
} }
...@@ -173,7 +175,7 @@ static void __init stm32_clockevent_init(struct device_node *np) ...@@ -173,7 +175,7 @@ static void __init stm32_clockevent_init(struct device_node *np)
pr_info("%s: STM32 clockevent driver initialized (%d bits)\n", pr_info("%s: STM32 clockevent driver initialized (%d bits)\n",
np->full_name, bits); np->full_name, bits);
return; return ret;
err_get_irq: err_get_irq:
iounmap(data->base); iounmap(data->base);
...@@ -182,7 +184,7 @@ static void __init stm32_clockevent_init(struct device_node *np) ...@@ -182,7 +184,7 @@ static void __init stm32_clockevent_init(struct device_node *np)
err_clk_enable: err_clk_enable:
clk_put(clk); clk_put(clk);
err_clk_get: err_clk_get:
return; return ret;
} }
CLOCKSOURCE_OF_DECLARE(stm32, "st,stm32-timer", stm32_clockevent_init); CLOCKSOURCE_OF_DECLARE_RET(stm32, "st,stm32-timer", stm32_clockevent_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment