From bfbf525543572e8820c707910c799636c17fc496 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 1 Mar 2007 04:09:10 -0800 Subject: [PATCH] ARM: OMAP: Fix timer compile Fix timer compile Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/time.c | 2 +- arch/arm/plat-omap/common.c | 2 +- arch/arm/plat-omap/timer32k.c | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 64fefff5d99..9baec671045 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -173,7 +173,7 @@ static struct clocksource clocksource_mpu = { .read = mpu_read, .mask = CLOCKSOURCE_MASK(32), .shift = 24, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static void __init omap_init_clocksource(unsigned long rate) diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 2a72b9a4401..1e106d18b18 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -212,7 +212,7 @@ static struct clocksource clocksource_32k = { .read = omap_32k_read, .mask = CLOCKSOURCE_MASK(32), .shift = 10, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init omap_init_clocksource_32k(void) diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index 884a280f8a1..f28e12883e9 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c @@ -272,22 +272,6 @@ static int omap_32k_timer_disable_dyn_tick(void) return 0; } -static irqreturn_t omap_32k_timer_handler(int irq, void *dev_id) -{ - unsigned long now; - - now = omap_32k_sync_timer_read(); - - /* Don't bother reprogramming timer if last tick was before next - * jiffie. We will get another interrupt when previously programmed - * timer expires. This cuts down interrupt load quite a bit. - */ - if (now - omap_32k_last_tick < OMAP_32K_TICKS_PER_HZ) - return IRQ_HANDLED; - - return _omap_32k_timer_interrupt(irq, dev_id); -} - static struct dyn_tick_timer omap_dyn_tick_timer = { .enable = omap_32k_timer_enable_dyn_tick, .disable = omap_32k_timer_disable_dyn_tick, -- 2.41.1