Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / media / radio / radio-cadet.c

diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 82affaedf06778ad73d0d40fa1a87b0e621630cd..cbaf850f47912792c75e8b9fed8de4b9258816ba 100644 (file)
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -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);
 }