mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v1] clocksource: arc_timer: remove duplicate error message
@ 2020-04-29 15:12 Dejin Zheng
  2020-05-18 16:21 ` Daniel Lezcano
  2020-06-01 13:11 ` [tip: timers/core] clocksource/drivers/arc_timer: Remove " tip-bot2 for Dejin Zheng
  0 siblings, 2 replies; 3+ messages in thread
From: Dejin Zheng @ 2020-04-29 15:12 UTC (permalink / raw)
  To: vgupta, daniel.lezcano, tglx, linux-snps-arc; +Cc: linux-kernel, Dejin Zheng

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 <zhengdejin5@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 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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v1] clocksource: arc_timer: remove duplicate error message
  2020-04-29 15:12 [PATCH v1] clocksource: arc_timer: remove duplicate error message Dejin Zheng
@ 2020-05-18 16:21 ` Daniel Lezcano
  2020-06-01 13:11 ` [tip: timers/core] clocksource/drivers/arc_timer: Remove " tip-bot2 for Dejin Zheng
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Lezcano @ 2020-05-18 16:21 UTC (permalink / raw)
  To: Dejin Zheng, vgupta, tglx, linux-snps-arc; +Cc: linux-kernel

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 <zhengdejin5@gmail.com>

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [tip: timers/core] clocksource/drivers/arc_timer: Remove duplicate error message
  2020-04-29 15:12 [PATCH v1] clocksource: arc_timer: remove duplicate error message Dejin Zheng
  2020-05-18 16:21 ` Daniel Lezcano
@ 2020-06-01 13:11 ` tip-bot2 for Dejin Zheng
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Dejin Zheng @ 2020-06-01 13:11 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Dejin Zheng, Daniel Lezcano, x86, LKML

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 <zhengdejin5@gmail.com>
AuthorDate:    Wed, 29 Apr 2020 23:12:23 +08:00
Committer:     Daniel Lezcano <daniel.lezcano@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 <zhengdejin5@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200429151223.3120-1-zhengdejin5@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,

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-06-01 13:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-29 15:12 [PATCH v1] clocksource: arc_timer: remove duplicate error message Dejin Zheng
2020-05-18 16:21 ` Daniel Lezcano
2020-06-01 13:11 ` [tip: timers/core] clocksource/drivers/arc_timer: Remove " tip-bot2 for Dejin Zheng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®