diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 1258494..02b37d1 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -83,13 +83,6 @@ enum {
 static struct msm_clock msm_clocks[];
 static struct msm_clock *msm_active_clock;

-static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
-{
-        u64 ret = (u64)cycles;
-        ret = (ret * cs->mult) >> cs->shift;
-        return ret;
-}
-
 static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
 {
        struct clock_event_device *evt = dev_id;
@@ -400,7 +393,7 @@ int64_t msm_timer_enter_idle(void)
        if (delta <= 0)
                return 0;
        //TODO: is this
-       return cyc2ns(&clock->clocksource, (alarm - count));
+       return clocksource_cyc2ns((alarm - count) >> clock->shift, clock->clocksource.mult, clock->clocksource.shift);
        //return ((u64)clock->mult) * ((alarm - count) >> clock->shift));
 }

@@ -445,13 +438,13 @@ unsigned long long sched_clock(void)
                if (!saved_ticks_valid) {
                        saved_ticks_valid = 1;
                        last_ticks = ticks;
-                       base -= cyc2ns(cs, ticks);
+                       base -= clocksource_cyc2ns(ticks, cs->mult, cs->shift);
                }
                if (ticks < last_ticks) {
-                       base += cyc2ns(cs, cs->mask);
-                       base += cyc2ns(cs, 1);
+                       base += clocksource_cyc2ns(cs->mask, cs->mult, cs->shift);
+                       base += clocksource_cyc2ns(1, cs->mult, cs->shift);
                }
-               last_result = result = cyc2ns(cs, ticks) + base;
+               last_result = result = clocksource_cyc2ns(ticks, cs->mult, cs->shift)  + base;
        } else {
                base = result = last_result;
                saved_ticks_valid = 0;