The following commit has been merged into the timers/core branch of tip: Commit-ID: 311fb70aa55174ddebb5c6022b23e58b85e9f116 Gitweb: https://git.kernel.org/tip/311fb70aa55174ddebb5c6022b23e58b85e9f116 Author: Dejin Zheng <zhengdej...@gmail.com> AuthorDate: Wed, 29 Apr 2020 23:12:23 +08:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Fri, 22 May 2020 23:58:56 +02:00
clocksource/drivers/arc_timer: Remove duplicate error message The function arc_get_timer_clk() prints an error message if it fails, remove the second error message if the function fails. Signed-off-by: Dejin Zheng <zhengdej...@gmail.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Link: https://lore.kernel.org/r/20200429151223.3120-1-zhengdej...@gmail.com --- drivers/clocksource/arc_timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c index b29b5a7..de93dd1 100644 --- a/drivers/clocksource/arc_timer.c +++ b/drivers/clocksource/arc_timer.c @@ -334,10 +334,8 @@ static int __init arc_clockevent_setup(struct device_node *node) } ret = arc_get_timer_clk(node); - if (ret) { - pr_err("clockevent: missing clk\n"); + if (ret) return ret; - } /* Needs apriori irq_set_percpu_devid() done in intc map function */ ret = request_percpu_irq(arc_timer_irq, timer_irq_handler,
