mirror of
https://github.com/torvalds/linux
synced 2024-10-05 10:52:54 +00:00
[media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end
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:
parent
651c7a5f7f
commit
7c8352d18d
|
@ -420,11 +420,11 @@ static int __saa7134_ir_start(void *priv)
|
||||||
if (ir->polling) {
|
if (ir->polling) {
|
||||||
setup_timer(&ir->timer, saa7134_input_timer,
|
setup_timer(&ir->timer, saa7134_input_timer,
|
||||||
(unsigned long)dev);
|
(unsigned long)dev);
|
||||||
ir->timer.expires = jiffies + HZ;
|
ir->timer.expires = jiffies + HZ;
|
||||||
add_timer(&ir->timer);
|
add_timer(&ir->timer);
|
||||||
} else if (ir->raw_decode) {
|
} else if (ir->raw_decode) {
|
||||||
/* set timer_end for code completion */
|
/* 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);
|
(unsigned long)dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -443,10 +443,8 @@ static void __saa7134_ir_stop(void *priv)
|
||||||
if (!ir->running)
|
if (!ir->running)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ir->polling)
|
if (ir->polling || ir->raw_decode)
|
||||||
del_timer_sync(&ir->timer);
|
del_timer_sync(&ir->timer);
|
||||||
else if (ir->raw_decode)
|
|
||||||
del_timer_sync(&ir->timer_end);
|
|
||||||
|
|
||||||
ir->active = false;
|
ir->active = false;
|
||||||
ir->running = false;
|
ir->running = false;
|
||||||
|
@ -923,7 +921,7 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev)
|
||||||
*/
|
*/
|
||||||
if (!ir->active) {
|
if (!ir->active) {
|
||||||
timeout = jiffies + jiffies_to_msecs(15);
|
timeout = jiffies + jiffies_to_msecs(15);
|
||||||
mod_timer(&ir->timer_end, timeout);
|
mod_timer(&ir->timer, timeout);
|
||||||
ir->active = true;
|
ir->active = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,6 @@ struct saa7134_card_ir {
|
||||||
bool active;
|
bool active;
|
||||||
|
|
||||||
struct timer_list timer;
|
struct timer_list timer;
|
||||||
struct timer_list timer_end; /* timer_end for code completion */
|
|
||||||
|
|
||||||
/* IR core raw decoding */
|
/* IR core raw decoding */
|
||||||
u32 raw_decode;
|
u32 raw_decode;
|
||||||
|
|
Loading…
Reference in a new issue