|
@@ -288,16 +288,16 @@ err_clk_enable:
|
|
* 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 lpc32xx_timer_init(struct device_node *np)
|
|
|
|
|
|
+static int __init lpc32xx_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 = lpc32xx_clocksource_init(np);
|
|
ret = lpc32xx_clocksource_init(np);
|
|
if (!ret) {
|
|
if (!ret) {
|
|
has_clocksource = 1;
|
|
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);
|
|
ret = lpc32xx_clockevent_init(np);
|
|
if (!ret) {
|
|
if (!ret) {
|
|
has_clockevent = 1;
|
|
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);
|