[25/93] clocksource/drivers/clksrc-dbx500: Convert init function to return error

Message ID 1467878526-1238-25-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit 108a4ed965b601986d054c0f0cf6f964959e0017
Headers show

Commit Message

Daniel Lezcano July 7, 2016, 8 a.m.
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


  - 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

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

 drivers/clocksource/clksrc-dbx500-prcmu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


linux-arm-kernel mailing list


diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index dfad6eb..5a59d29 100644
--- a/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -64,7 +64,7 @@  static u64 notrace dbx500_prcmu_sched_clock_read(void)
-static void __init clksrc_dbx500_prcmu_init(struct device_node *node)
+static int __init clksrc_dbx500_prcmu_init(struct device_node *node)
 	clksrc_dbx500_timer_base = of_iomap(node, 0);
@@ -84,7 +84,7 @@  static void __init clksrc_dbx500_prcmu_init(struct device_node *node)
 	sched_clock_register(dbx500_prcmu_sched_clock_read, 32, RATE_32K);
-	clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K);
+	return clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K);
-CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4",
+CLOCKSOURCE_OF_DECLARE_RET(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4",