summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2016-06-06 23:29:30 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2016-06-28 10:19:32 +0200
commit86de9628230956aa976fe50f407a25bd268d8a68 (patch)
treec5f4bd1d8043c40846ae2655efbf107e2a0d56b9
parent1ee078facfd4f26f516becd4c73a7e6a2e520965 (diff)
downloadop-kernel-dev-86de9628230956aa976fe50f407a25bd268d8a68.zip
op-kernel-dev-86de9628230956aa976fe50f407a25bd268d8a68.tar.gz
clocksource/drivers/versatile: 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>
-rw-r--r--drivers/clocksource/versatile.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c
index 0a26d3d..8daeffa 100644
--- a/drivers/clocksource/versatile.c
+++ b/drivers/clocksource/versatile.c
@@ -25,18 +25,20 @@ static u64 notrace versatile_sys_24mhz_read(void)
return readl(versatile_sys_24mhz);
}
-static void __init versatile_sched_clock_init(struct device_node *node)
+static int __init versatile_sched_clock_init(struct device_node *node)
{
void __iomem *base = of_iomap(node, 0);
if (!base)
- return;
+ return -ENXIO;
versatile_sys_24mhz = base + SYS_24MHZ;
sched_clock_register(versatile_sys_24mhz_read, 32, 24000000);
+
+ return 0;
}
-CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg",
+CLOCKSOURCE_OF_DECLARE_RET(vexpress, "arm,vexpress-sysreg",
versatile_sched_clock_init);
-CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg",
+CLOCKSOURCE_OF_DECLARE_RET(versatile, "arm,versatile-sysreg",
versatile_sched_clock_init);
OpenPOWER on IntegriCloud