Commit 0cc7afc6 authored by Daniel Lezcano's avatar Daniel Lezcano

clocksource/drivers/mps2-timer: 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 avatarLiviu Dudau <Liviu.Dudau@arm.com>
parent b7357e65
...@@ -250,7 +250,7 @@ static int __init mps2_clocksource_init(struct device_node *np) ...@@ -250,7 +250,7 @@ static int __init mps2_clocksource_init(struct device_node *np)
return ret; return ret;
} }
static void __init mps2_timer_init(struct device_node *np) static int __init mps2_timer_init(struct device_node *np)
{ {
static int has_clocksource, has_clockevent; static int has_clocksource, has_clockevent;
int ret; int ret;
...@@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np) ...@@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np)
ret = mps2_clocksource_init(np); ret = mps2_clocksource_init(np);
if (!ret) { if (!ret) {
has_clocksource = 1; has_clocksource = 1;
return; return 0;
} }
} }
...@@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np) ...@@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np)
ret = mps2_clockevent_init(np); ret = mps2_clockevent_init(np);
if (!ret) { if (!ret) {
has_clockevent = 1; has_clockevent = 1;
return; return 0;
} }
} }
return 0;
} }
CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); CLOCKSOURCE_OF_DECLARE_RET(mps2_timer, "arm,mps2-timer", mps2_timer_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