[PATCHv3 4/9] ir-rx51: Clean up timer initialization code
From: Timo Kokkonen <hidden>
Date: 2012-08-30 17:54:34
Also in:
linux-media
Subsystem:
media input infrastructure (v4l/dvb), rc-core / lirc framework, the rest · Maintainers:
Mauro Carvalho Chehab, Sean Young, Linus Torvalds
Remove a redundant macro definition. This is unneeded and becomes more readable once the actual timer code is refactored a little. Signed-off-by: Timo Kokkonen <redacted> --- drivers/media/rc/ir-rx51.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 125d4c3..f22e5e4 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c@@ -105,11 +105,9 @@ static int init_timing_params(struct lirc_rx51 *lirc_rx51) return 0; } -#define tics_after(a, b) ((long)(b) - (long)(a) < 0) - static int pulse_timer_set_timeout(struct lirc_rx51 *lirc_rx51, int usec) { - int counter; + int counter, counter_now; BUG_ON(usec < 0);
@@ -122,11 +120,8 @@ static int pulse_timer_set_timeout(struct lirc_rx51 *lirc_rx51, int usec) omap_dm_timer_set_match(lirc_rx51->pulse_timer, 1, counter); omap_dm_timer_set_int_enable(lirc_rx51->pulse_timer, OMAP_TIMER_INT_MATCH); - if (tics_after(omap_dm_timer_read_counter(lirc_rx51->pulse_timer), - counter)) { - return 1; - } - return 0; + counter_now = omap_dm_timer_read_counter(lirc_rx51->pulse_timer); + return (counter - counter_now) < 0; } static irqreturn_t lirc_rx51_interrupt_handler(int irq, void *ptr)
--
1.7.12