|
@@ -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);
|
|
|
}
|