From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 4 Dec 2009 03:32:11 +0000 (+0000)
Subject: Blackfin: convert cyc2ns() to clocksource_cyc2ns()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c768a943fd8f41f5f7ed33c91d50818b301f5635;p=linux.git

Blackfin: convert cyc2ns() to clocksource_cyc2ns()

The former no longer exists.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index eef528389d2f5..17c38c5b5b22f 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -64,7 +64,8 @@ static struct clocksource bfin_cs_cycles = {
 
 static inline unsigned long long bfin_cs_cycles_sched_clock(void)
 {
-	return cyc2ns(&bfin_cs_cycles, bfin_read_cycles(&bfin_cs_cycles));
+	return clocksource_cyc2ns(bfin_read_cycles(&bfin_cs_cycles),
+		bfin_cs_cycles.mult, bfin_cs_cycles.shift);
 }
 
 static int __init bfin_cs_cycles_init(void)
@@ -111,7 +112,8 @@ static struct clocksource bfin_cs_gptimer0 = {
 
 static inline unsigned long long bfin_cs_gptimer0_sched_clock(void)
 {
-	return cyc2ns(&bfin_cs_gptimer0, bfin_read_TIMER0_COUNTER());
+	return clocksource_cyc2ns(bfin_read_TIMER0_COUNTER(),
+		bfin_cs_gptimer0.mult, bfin_cs_gptimer0.shift);
 }
 
 static int __init bfin_cs_gptimer0_init(void)