|
@@ -19,7 +19,7 @@ static u64 notrace read_sched_clock(void)
|
|
|
return read_xtal_counter();
|
|
|
}
|
|
|
|
|
|
-static void __init tango_clocksource_init(struct device_node *np)
|
|
|
+static int __init tango_clocksource_init(struct device_node *np)
|
|
|
{
|
|
|
struct clk *clk;
|
|
|
int xtal_freq, ret;
|
|
@@ -27,13 +27,13 @@ static void __init tango_clocksource_init(struct device_node *np)
|
|
|
xtal_in_cnt = of_iomap(np, 0);
|
|
|
if (xtal_in_cnt == NULL) {
|
|
|
pr_err("%s: invalid address\n", np->full_name);
|
|
|
- return;
|
|
|
+ return -ENXIO;
|
|
|
}
|
|
|
|
|
|
clk = of_clk_get(np, 0);
|
|
|
if (IS_ERR(clk)) {
|
|
|
pr_err("%s: invalid clock\n", np->full_name);
|
|
|
- return;
|
|
|
+ return PTR_ERR(clk);
|
|
|
}
|
|
|
|
|
|
xtal_freq = clk_get_rate(clk);
|
|
@@ -44,11 +44,13 @@ static void __init tango_clocksource_init(struct device_node *np)
|
|
|
32, clocksource_mmio_readl_up);
|
|
|
if (ret) {
|
|
|
pr_err("%s: registration failed\n", np->full_name);
|
|
|
- return;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
sched_clock_register(read_sched_clock, 32, xtal_freq);
|
|
|
register_current_timer_delay(&delay_timer);
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
-CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init);
|
|
|
+CLOCKSOURCE_OF_DECLARE_RET(tango, "sigma,tick-counter", tango_clocksource_init);
|