renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

clocksource/drivers/time-efm32: Convert init function to return error

Browse Source 
The init functions do not return any error and let the caller unaware of
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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Daniel Lezcano 2016-06-06 18:00:14 +02:00
parent 12549e27c6
commit dc5011131b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/clocksource/time-efm32.c
View File

@ -233,10 +233,15 @@ static int __init efm32_clockevent_init(struct device_node *np)
DIV_ROUND_CLOSEST(rate, 1024), DIV_ROUND_CLOSEST(rate, 1024),
0xf, 0xffff); 0xf, 0xffff);
setup_irq(irq, &efm32_clock_event_irq); ret = setup_irq(irq, &efm32_clock_event_irq);
if (ret) {
pr_err("Failed setup irq");
goto err_setup_irq;
}
return 0; return 0;
err_setup_irq:
err_get_irq: err_get_irq:
iounmap(base); iounmap(base);
@ -255,16 +260,16 @@ err_clk_get:
* This function asserts that we have exactly one clocksource and one * This function asserts that we have exactly one clocksource and one
* clock_event_device in the end. * clock_event_device in the end.
*/ */
static void __init efm32_timer_init(struct device_node *np) static int __init efm32_timer_init(struct device_node *np)
{ {
static int has_clocksource, has_clockevent; static int has_clocksource, has_clockevent;
int ret; int ret = 0;
if (!has_clocksource) { if (!has_clocksource) {
ret = efm32_clocksource_init(np); ret = efm32_clocksource_init(np);
if (!ret) { if (!ret) {
has_clocksource = 1; has_clocksource = 1;
return; return 0;
} }
} }
@ -272,9 +277,11 @@ static void __init efm32_timer_init(struct device_node *np)
ret = efm32_clockevent_init(np); ret = efm32_clockevent_init(np);
if (!ret) { if (!ret) {
has_clockevent = 1; has_clockevent = 1;
return; return 0;
} }
} }
return ret;
} }
CLOCKSOURCE_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init); CLOCKSOURCE_OF_DECLARE_RET(efm32compat, "efm32,timer", efm32_timer_init);
CLOCKSOURCE_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init); CLOCKSOURCE_OF_DECLARE_RET(efm32, "energymicro,efm32-timer", efm32_timer_init);