summaryrefslogtreecommitdiff
path: root/drivers/clocksource/mps2-timer.c
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2016-06-06 17:57:50 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2016-06-28 10:19:24 +0200
commit0cc7afc6e0ccd593f4ce86feb83ac45cd6bd9440 (patch)
treeae2c799c69ee653f65d3dde51106416bccde1586 /drivers/clocksource/mps2-timer.c
parentb7357e656ca45dd57ef02f2a1be513af2b80579c (diff)
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: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Diffstat (limited to 'drivers/clocksource/mps2-timer.c')
-rw-r--r--drivers/clocksource/mps2-timer.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c
index 3d33a5e23dee..c303fa9ba87f 100644
--- a/drivers/clocksource/mps2-timer.c
+++ b/drivers/clocksource/mps2-timer.c
@@ -250,7 +250,7 @@ out:
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;
int ret;
@@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np)
ret = mps2_clocksource_init(np);
if (!ret) {
has_clocksource = 1;
- return;
+ return 0;
}
}
@@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np)
ret = mps2_clockevent_init(np);
if (!ret) {
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);