ARM: OMAP1: Remove unused cycles-to-nsec conversions
Subsystems (3)
PATCH 1/1 ARM: OMAP1: Remove unused cycles-to-nsec conversions
These are no longer used and similar conversions are provided by the clocksource/clockevent code.
Signed-off-by Kevin Hilman <[email protected]>
arch/arm/mach-omap1/time.c +0 -33
@@ -56,37 +56,6 @@#define OMAP_MPU_TIMER_BASE OMAP_MPU_TIMER1_BASE#define OMAP_MPU_TIMER_OFFSET 0x100 -/* cycles to nsec conversions taken from arch/i386/kernel/timers/timer_tsc.c, -* converted to use kHz by Kevin Hilman */ -/* convert from cycles(64bits) => nanoseconds (64bits) -* basic equation: -* ns = cycles / (freq / ns_per_sec) -* ns = cycles * (ns_per_sec / freq) -* ns = cycles * (10^9 / (cpu_khz * 10^3)) -* ns = cycles * (10^6 / cpu_khz) -* -* Then we use scaling math (suggested by george at mvista.com) to get: -* ns = cycles * (10^6 * SC / cpu_khz / SC -* ns = cycles * cyc2ns_scale / SC -* -* And since SC is a constant power of two, we can convert the div -* into a shift. -* -johnstul at us.ibm.com "math is hard, lets go shopping!" -*/ -static unsigned long cyc2ns_scale; -#define CYC2NS_SCALE_FACTOR 10/* 2^10, carefully chosen */ - -static inline void set_cyc2ns_scale (unsigned long cpu_khz) -{ - cyc2ns_scale = (1000000 <<CYC2NS_SCALE_FACTOR )/cpu_khz; -} - -static inline unsigned long long cycles_2_ns (unsigned long long cyc) -{ -return (cyc * cyc2ns_scale) >>CYC2NS_SCALE_FACTOR ; -} - - typedef struct { u32 cntl; /* CNTL_TIMER, R/W */ u32 load_tim; /* LOAD_TIM, W */
@@ -194,8 +163,6 @@ static struct irqaction omap_mpu_timer1_irq = {static __init void omap_init_mpu_timer (unsigned long rate) { -set_cyc2ns_scale (rate /1000 ); -setup_irq (INT_TIMER1 , &omap_mpu_timer1_irq);omap_mpu_timer_start (0 , (rate /HZ ) -1 ,1 );
--
Tony Lindgren
reviewerQuoted 2 lines · Kevin Hilman
These are no longer used and similar conversions are provided by the clocksource/clockevent code.
Pushing today.
Tony