2020-04-29 15:17:53

by Dejin Zheng

[permalink] [raw]
Subject: [PATCH v1] clocksource: arc_timer: remove duplicate error message

it will print an error message by itself when arc_get_timer_clk()
goes wrong. so remove the duplicate error message.

Signed-off-by: Dejin Zheng <[email protected]>
---
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 b29b5a75333e..de93dd1a8c7b 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,
--
2.25.0


2020-05-18 16:25:54

by Daniel Lezcano

[permalink] [raw]
Subject: Re: [PATCH v1] clocksource: arc_timer: remove duplicate error message

On 29/04/2020 17:12, Dejin Zheng wrote:
> it will print an error message by itself when arc_get_timer_clk()
> goes wrong. so remove the duplicate error message.
>
> Signed-off-by: Dejin Zheng <[email protected]>

Applied, thanks


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Subject: [tip: timers/core] clocksource/drivers/arc_timer: Remove duplicate error message

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 <[email protected]>
AuthorDate: Wed, 29 Apr 2020 23:12:23 +08:00
Committer: Daniel Lezcano <[email protected]>
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 <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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,