Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c8352d1 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 651c7a5f

drivers/media/video/saa7134/saa7134-input.c

+4 −6
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int __saa7134_ir_start(void *priv) 
		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;

	}

drivers/media/video/saa7134/saa7134.h

+0 −1
Original line number Diff line number Diff line
@@ -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;