]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Blackfin: convert cyc2ns() to clocksource_cyc2ns()
authorMike Frysinger <vapier@gentoo.org>
Fri, 4 Dec 2009 03:32:11 +0000 (03:32 +0000)
committerMike Frysinger <vapier@gentoo.org>
Tue, 15 Dec 2009 05:16:47 +0000 (00:16 -0500)
The former no longer exists.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
arch/blackfin/kernel/time-ts.c

index eef528389d2f5836d4ad039dd6642068ff7d9dad..17c38c5b5b22f60edd2273c5715888cc8eb45083 100644 (file)
@@ -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)