[tip:timers/urgent] clocksource/drivers/time-armada-370-xp: Fix the clock reference

From: tip-bot for Gregory CLEMENT
Date: Wed Aug 17 2016 - 09:38:51 EST


Commit-ID: 0e62fd836e4c2908cc1e32c68806529b4f859955
Gitweb: http://git.kernel.org/tip/0e62fd836e4c2908cc1e32c68806529b4f859955
Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
AuthorDate: Wed, 17 Aug 2016 12:21:33 +0200
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Wed, 17 Aug 2016 13:08:31 +0200

clocksource/drivers/time-armada-370-xp: Fix the clock reference

While converting the init function to return an error, the wrong clock
was get. This leads to the wrong clock rate and slows down the kernel.
For example, it affects typical boot time:

- without fix: over 1 minute
- with fix: 15 seconds

Tested-by: Stefan Roese <sr@xxxxxxx>
Tested-by: Ralph Sennhauser <ralph.sennhauser@xxxxxxxxx>
Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Fixes: 12549e27c63c ("clocksource/drivers/time-armada-370-xp: Convert init function to return error")
Link: http://lkml.kernel.org/r/1471429296-9053-1-git-send-email-daniel.lezcano@xxxxxxxxxx
[ Refined the changelog. ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
drivers/clocksource/time-armada-370-xp.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 719b478..3c39e6f 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -338,7 +338,6 @@ static int __init armada_xp_timer_init(struct device_node *np)
struct clk *clk = of_clk_get_by_name(np, "fixed");
int ret;

- clk = of_clk_get(np, 0);
if (IS_ERR(clk)) {
pr_err("Failed to get clock");
return PTR_ERR(clk);