| Message ID | 1473343090-29208-2-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, Sep 8, 2016 at 11:28 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > The clksrc-of code is supposed to catch the return code and fail gracefully. > > Don't panic on error, but print the error and exit with a relevant error > code. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Joel Stanley <joel@jms.id.au> > --- > drivers/clocksource/moxart_timer.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c > index cba25b7..2a8f470 100644 > --- a/drivers/clocksource/moxart_timer.c > +++ b/drivers/clocksource/moxart_timer.c > @@ -184,8 +184,10 @@ static int __init moxart_timer_init(struct device_node *node) > } else if (of_device_is_compatible(node, "aspeed,ast2400-timer")) { > timer->t1_enable_val = ASPEED_TIMER1_ENABLE; > timer->t1_disable_val = ASPEED_TIMER1_DISABLE; > - } else > - panic("%s: unknown platform\n", node->full_name); > + } else { > + pr_err("%s: unknown platform\n", node->full_name); > + return -EINVAL; > + } > > timer->count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ); > > -- > 1.9.1 >
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index cba25b7..2a8f470 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -184,8 +184,10 @@ static int __init moxart_timer_init(struct device_node *node) } else if (of_device_is_compatible(node, "aspeed,ast2400-timer")) { timer->t1_enable_val = ASPEED_TIMER1_ENABLE; timer->t1_disable_val = ASPEED_TIMER1_DISABLE; - } else - panic("%s: unknown platform\n", node->full_name); + } else { + pr_err("%s: unknown platform\n", node->full_name); + return -EINVAL; + } timer->count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ);
The clksrc-of code is supposed to catch the return code and fail gracefully. Don't panic on error, but print the error and exit with a relevant error code. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/clocksource/moxart_timer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.9.1