[media] media: radio-cadet, initialize timer with setup_timer (75d1b137) · Commits · 戴 / test

Stop accessing timer struct members directly and use the setup_timer helper intended for that use. It makes the code cleaner and will allow for easier change of the timer struct internals. Signed-off-by:

Matej Hulín <mito.hulin@gmail.com> Signed-off-by:

Jiri Slaby <jslaby@suse.cz> Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@s-opensource.com>

drivers/media/radio/radio-cadet.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -309,9 +309,7 @@ static void cadet_handler(unsigned long data)
		/*
		* Clean up and exit
		*/
		init_timer(&dev->readtimer);
		dev->readtimer.function = cadet_handler;
		dev->readtimer.data = data;
		setup_timer(&dev->readtimer, cadet_handler, data);
		dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
		add_timer(&dev->readtimer);
		}
		@@ -320,9 +318,7 @@ static void cadet_start_rds(struct cadet *dev)
		{
		dev->rdsstat = 1;
		outb(0x80, dev->io); /* Select RDS fifo */
		init_timer(&dev->readtimer);
		dev->readtimer.function = cadet_handler;
		dev->readtimer.data = (unsigned long)dev;
		setup_timer(&dev->readtimer, cadet_handler, (unsigned long)dev);
		dev->readtimer.expires = jiffies + msecs_to_jiffies(50);
		add_timer(&dev->readtimer);
		}

Admin message