system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 10:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end

Browse source 
Both timers are used for a similar purpose. Merging them allows for some
minor simplifications.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
David Härdeman 2010-11-19 20:42:57 -03:00 committed by Mauro Carvalho Chehab
parent 651c7a5f7f
commit 7c8352d18d
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/video/saa7134/saa7134-input.c
View file

@ -420,11 +420,11 @@ static int __saa7134_ir_start(void *priv)
if (ir->polling) {
setup_timer(&ir->timer, saa7134_input_timer,
(unsigned long)dev);
ir->timer.expires = jiffies + HZ;
ir->timer.expires = jiffies + HZ;
add_timer(&ir->timer);
} else if (ir->raw_decode) {
/* set timer_end for code completion */
setup_timer(&ir->timer_end, ir_raw_decode_timer_end,
setup_timer(&ir->timer, ir_raw_decode_timer_end,
(unsigned long)dev);
}
@ -443,10 +443,8 @@ static void __saa7134_ir_stop(void *priv)
if (!ir->running)
return;
if (ir->polling)
if (ir->polling || ir->raw_decode)
del_timer_sync(&ir->timer);
else if (ir->raw_decode)
del_timer_sync(&ir->timer_end);
ir->active = false;
ir->running = false;
@ -923,7 +921,7 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
*/
if (!ir->active) {
timeout = jiffies + jiffies_to_msecs(15);
mod_timer(&ir->timer_end, timeout);
mod_timer(&ir->timer, timeout);
ir->active = true;
}

1
drivers/media/video/saa7134/saa7134.h
View file

@ -134,7 +134,6 @@ struct saa7134_card_ir {
bool active;
struct timer_list timer;
struct timer_list timer_end; /* timer_end for code completion */
/* IR core raw decoding */
u32 raw_decode;