Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] media: radio-cadet, initialize timer with setup_timer

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>

authored by

Matej Hulín and committed by
Mauro Carvalho Chehab
75d1b137 ca80fbcd

+2 -6
+2 -6
drivers/media/radio/radio-cadet.c
··· 309 309 /* 310 310 * Clean up and exit 311 311 */ 312 - init_timer(&dev->readtimer); 313 - dev->readtimer.function = cadet_handler; 314 - dev->readtimer.data = data; 312 + setup_timer(&dev->readtimer, cadet_handler, data); 315 313 dev->readtimer.expires = jiffies + msecs_to_jiffies(50); 316 314 add_timer(&dev->readtimer); 317 315 } ··· 318 320 { 319 321 dev->rdsstat = 1; 320 322 outb(0x80, dev->io); /* Select RDS fifo */ 321 - init_timer(&dev->readtimer); 322 - dev->readtimer.function = cadet_handler; 323 - dev->readtimer.data = (unsigned long)dev; 323 + setup_timer(&dev->readtimer, cadet_handler, (unsigned long)dev); 324 324 dev->readtimer.expires = jiffies + msecs_to_jiffies(50); 325 325 add_timer(&dev->readtimer); 326 326 }