Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e2afeb9 authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

clocksource/drivers/time-lpc32xx: 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 avatarSylvain Lemieux <slemieux.tyco@gmail.com>
parent dc501113

drivers/clocksource/time-lpc32xx.c

+7 −5
Original line number Diff line number Diff line
@@ -288,16 +288,16 @@ static int __init lpc32xx_clockevent_init(struct device_node *np) 
 * This function asserts that we have exactly one clocksource and one

 * clock_event_device in the end.

 */

static void __init lpc32xx_timer_init(struct device_node *np)

static int __init lpc32xx_timer_init(struct device_node *np)

{

	static int has_clocksource, has_clockevent;

	int ret;

	int ret = 0;



	if (!has_clocksource) {

		ret = lpc32xx_clocksource_init(np);

		if (!ret) {

			has_clocksource = 1;

			return;

			return 0;

		}

	}
@@ -305,8 +305,10 @@ static void __init lpc32xx_timer_init(struct device_node *np) 
		ret = lpc32xx_clockevent_init(np);

		if (!ret) {

			has_clockevent = 1;

			return;

			return 0;

		}

	}



	return ret;

}

CLOCKSOURCE_OF_DECLARE(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init);
 
CLOCKSOURCE_OF_DECLARE_RET(lpc32xx_timer, "nxp,lpc3220-timer", lpc32xx_timer_init);