瀏覽代碼

Blackfin: convert cyc2ns() to clocksource_cyc2ns()

The former no longer exists.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger 15 年之前
父節點
當前提交
c768a943fd
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      arch/blackfin/kernel/time-ts.c

+ 4 - 2
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)