Merge tag 'timers-conversion-next4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core

Pull the 4th timer conversion batch from Kees Cook

 - A couple fixes for less common build configurations

 - More stragglers that have either been reviewed or gone
   long enough on list

16 files changed, 47 insertions, 78 deletions

diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index 8407e4a07c77..e7b350f18f5f 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -141,7 +141,7 @@ static void dc21285_enable_error(struct timer_list *timer)
         del_timer(timer);
 
         if (timer == &serr_timer)
-                enable_irq(IRQ_PCI_SERR)
+                enable_irq(IRQ_PCI_SERR);
         else if (timer == &perr_timer)
                 enable_irq(IRQ_PCI_PERR);
 }
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index 4b987c2fefbe..251482066977 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -15,49 +15,19 @@ MODULE_AUTHOR("Sam Hopkins <sah@coraid.com>");
 MODULE_DESCRIPTION("AoE block/char driver for 2.6.2 and newer 2.6 kernels");
 MODULE_VERSION(VERSION);
 
-enum { TINIT, TRUN, TKILL };
+static struct timer_list timer;
 
-static void
-discover_timer(ulong vp)
+static void discover_timer(struct timer_list *t)
 {
-        static struct timer_list t;
-        static volatile ulong die;
-        static spinlock_t lock;
-        ulong flags;
-        enum { DTIMERTICK = HZ * 60 }; /* one minute */
-
-        switch (vp) {
-        case TINIT:
-                init_timer(&t);
-                spin_lock_init(&lock);
-                t.data = TRUN;
-                t.function = discover_timer;
-                die = 0;
-        case TRUN:
-                spin_lock_irqsave(&lock, flags);
-                if (!die) {
-                        t.expires = jiffies + DTIMERTICK;
-                        add_timer(&t);
-                }
-                spin_unlock_irqrestore(&lock, flags);
-
-                aoecmd_cfg(0xffff, 0xff);
-                return;
-        case TKILL:
-                spin_lock_irqsave(&lock, flags);
-                die = 1;
-                spin_unlock_irqrestore(&lock, flags);
+        mod_timer(t, jiffies + HZ * 60); /* one minute */
 
-                del_timer_sync(&t);
-        default:
-                return;
-        }
+        aoecmd_cfg(0xffff, 0xff);
 }
 
 static void
 aoe_exit(void)
 {
-        discover_timer(TKILL);
+        del_timer_sync(&timer);
 
         aoenet_exit();
         unregister_blkdev(AOE_MAJOR, DEVICE_NAME);
@@ -93,7 +63,9 @@ aoe_init(void)
                 goto blkreg_fail;
         }
         printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);
-        discover_timer(TINIT);
+
+        timer_setup(&timer, discover_timer, 0);
+        discover_timer(&timer);
         return 0;
  blkreg_fail:
         aoecmd_exit();
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 7e8589ce631c..06ecee1b528e 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1551,8 +1551,8 @@ extern int w_restart_disk_io(struct drbd_work *, int);
 extern int w_send_out_of_sync(struct drbd_work *, int);
 extern int w_start_resync(struct drbd_work *, int);
 
-extern void resync_timer_fn(unsigned long data);
-extern void start_resync_timer_fn(unsigned long data);
+extern void resync_timer_fn(struct timer_list *t);
+extern void start_resync_timer_fn(struct timer_list *t);
 
 extern void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req);
 
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8cb3791898ae..4b4697a1f963 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -64,7 +64,7 @@
 static DEFINE_MUTEX(drbd_main_mutex);
 static int drbd_open(struct block_device *bdev, fmode_t mode);
 static void drbd_release(struct gendisk *gd, fmode_t mode);
-static void md_sync_timer_fn(unsigned long data);
+static void md_sync_timer_fn(struct timer_list *t);
 static int w_bitmap_io(struct drbd_work *w, int unused);
 
 MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, "
@@ -2023,14 +2023,10 @@ void drbd_init_set_defaults(struct drbd_device *device)
         device->unplug_work.cb  = w_send_write_hint;
         device->bm_io_work.w.cb = w_bitmap_io;
 
-        setup_timer(&device->resync_timer, resync_timer_fn,
-                        (unsigned long)device);
-        setup_timer(&device->md_sync_timer, md_sync_timer_fn,
-                        (unsigned long)device);
-        setup_timer(&device->start_resync_timer, start_resync_timer_fn,
-                        (unsigned long)device);
-        setup_timer(&device->request_timer, request_timer_fn,
-                        (unsigned long)device);
+        timer_setup(&device->resync_timer, resync_timer_fn, 0);
+        timer_setup(&device->md_sync_timer, md_sync_timer_fn, 0);
+        timer_setup(&device->start_resync_timer, start_resync_timer_fn, 0);
+        timer_setup(&device->request_timer, request_timer_fn, 0);
 
         init_waitqueue_head(&device->misc_wait);
         init_waitqueue_head(&device->state_wait);
@@ -3721,9 +3717,9 @@ int drbd_md_test_flag(struct drbd_backing_dev *bdev, int flag)
         return (bdev->md.flags & flag) != 0;
 }
 
-static void md_sync_timer_fn(unsigned long data)
+static void md_sync_timer_fn(struct timer_list *t)
 {
-        struct drbd_device *device = (struct drbd_device *) data;
+        struct drbd_device *device = from_timer(device, t, md_sync_timer);
         drbd_device_post_work(device, MD_SYNC);
 }
 
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 796eaf347dc0..cb2fa63f6bc0 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -5056,7 +5056,7 @@ static int drbd_disconnected(struct drbd_peer_device *peer_device)
         wake_up(&device->misc_wait);
 
         del_timer_sync(&device->resync_timer);
-        resync_timer_fn((unsigned long)device);
+        resync_timer_fn(&device->resync_timer);
 
         /* wait for all w_e_end_data_req, w_e_end_rsdata_req, w_send_barrier,
          * w_make_resync_request etc. which may still be on the worker queue
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index de8566e55334..a500e738d929 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1714,9 +1714,9 @@ static bool net_timeout_reached(struct drbd_request *net_req,
  * to expire twice (worst case) to become effective. Good enough.
  */
 
-void request_timer_fn(unsigned long data)
+void request_timer_fn(struct timer_list *t)
 {
-        struct drbd_device *device = (struct drbd_device *) data;
+        struct drbd_device *device = from_timer(device, t, request_timer);
         struct drbd_connection *connection = first_peer_device(device)->connection;
         struct drbd_request *req_read, *req_write, *req_peer; /* oldest request */
         struct net_conf *nc;
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index a2254f825601..cb97b3b30962 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -294,7 +294,7 @@ extern int __req_mod(struct drbd_request *req, enum drbd_req_event what,
                 struct bio_and_error *m);
 extern void complete_master_bio(struct drbd_device *device,
                 struct bio_and_error *m);
-extern void request_timer_fn(unsigned long data);
+extern void request_timer_fn(struct timer_list *t);
 extern void tl_restart(struct drbd_connection *connection, enum drbd_req_event what);
 extern void _tl_restart(struct drbd_connection *connection, enum drbd_req_event what);
 extern void tl_abort_disk_io(struct drbd_device *device);
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 03471b3fce86..1476cb3439f4 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -457,9 +457,9 @@ int w_resync_timer(struct drbd_work *w, int cancel)
         return 0;
 }
 
-void resync_timer_fn(unsigned long data)
+void resync_timer_fn(struct timer_list *t)
 {
-        struct drbd_device *device = (struct drbd_device *) data;
+        struct drbd_device *device = from_timer(device, t, resync_timer);
 
         drbd_queue_work_if_unqueued(
                 &first_peer_device(device)->connection->sender_work,
@@ -1705,9 +1705,9 @@ void drbd_rs_controller_reset(struct drbd_device *device)
         rcu_read_unlock();
 }
 
-void start_resync_timer_fn(unsigned long data)
+void start_resync_timer_fn(struct timer_list *t)
 {
-        struct drbd_device *device = (struct drbd_device *) data;
+        struct drbd_device *device = from_timer(device, t, start_resync_timer);
         drbd_device_post_work(device, RS_START);
 }
 
diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index d9fbbf01062b..6b515c2f2c14 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -2074,9 +2074,9 @@ static void artpec6_crypto_process_queue(struct artpec6_crypto *ac)
                 del_timer(&ac->timer);
 }
 
-static void artpec6_crypto_timeout(unsigned long data)
+static void artpec6_crypto_timeout(struct timer_list *t)
 {
-        struct artpec6_crypto *ac = (struct artpec6_crypto *) data;
+        struct artpec6_crypto *ac = from_timer(ac, t, timer);
 
         dev_info_ratelimited(artpec6_crypto_dev, "timeout\n");
 
@@ -3063,7 +3063,7 @@ static int artpec6_crypto_probe(struct platform_device *pdev)
         spin_lock_init(&ac->queue_lock);
         INIT_LIST_HEAD(&ac->queue);
         INIT_LIST_HEAD(&ac->pending);
-        setup_timer(&ac->timer, artpec6_crypto_timeout, (unsigned long) ac);
+        timer_setup(&ac->timer, artpec6_crypto_timeout, 0);
 
         ac->base = base;
 
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index bf25f415eea6..0eb2706f23c8 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -149,7 +149,7 @@ struct mv_req_hash_ctx {
         int count_add;
 };
 
-static void mv_completion_timer_callback(unsigned long unused)
+static void mv_completion_timer_callback(struct timer_list *unused)
 {
         int active = readl(cpg->reg + SEC_ACCEL_CMD) & SEC_CMD_EN_SEC_ACCL0;
 
@@ -167,7 +167,7 @@ static void mv_completion_timer_callback(unsigned long unused)
 
 static void mv_setup_timer(void)
 {
-        setup_timer(&cpg->completion_timer, &mv_completion_timer_callback, 0);
+        timer_setup(&cpg->completion_timer, mv_completion_timer_callback, 0);
         mod_timer(&cpg->completion_timer,
                         jiffies + msecs_to_jiffies(MV_CESA_EXPIRE));
 }
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index b6f14844702e..5a6dc53b2b9d 100644
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -1125,9 +1125,9 @@ static irqreturn_t spacc_spacc_irq(int irq, void *dev)
         return IRQ_HANDLED;
 }
 
-static void spacc_packet_timeout(unsigned long data)
+static void spacc_packet_timeout(struct timer_list *t)
 {
-        struct spacc_engine *engine = (struct spacc_engine *)data;
+        struct spacc_engine *engine = from_timer(engine, t, packet_timeout);
 
         spacc_process_done(engine);
 }
@@ -1714,8 +1714,7 @@ static int spacc_probe(struct platform_device *pdev)
         writel(SPA_IRQ_EN_STAT_EN | SPA_IRQ_EN_GLBL_EN,
                engine->regs + SPA_IRQ_EN_REG_OFFSET);
 
-        setup_timer(&engine->packet_timeout, spacc_packet_timeout,
-                    (unsigned long)engine);
+        timer_setup(&engine->packet_timeout, spacc_packet_timeout, 0);
 
         INIT_LIST_HEAD(&engine->pending);
         INIT_LIST_HEAD(&engine->completed);
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 3a234701d92c..6f25da56a169 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -611,9 +611,9 @@ static int drive_is_ready(ide_drive_t *drive)
  *      logic that wants cleaning up.
  */
  
-void ide_timer_expiry (unsigned long data)
+void ide_timer_expiry (struct timer_list *t)
 {
-        ide_hwif_t      *hwif = (ide_hwif_t *)data;
+        ide_hwif_t      *hwif = from_timer(hwif, t, timer);
         ide_drive_t     *uninitialized_var(drive);
         ide_handler_t   *handler;
         unsigned long   flags;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 01b2adfd8226..27a2488c7468 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1184,7 +1184,7 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
 
         spin_lock_init(&hwif->lock);
 
-        setup_timer(&hwif->timer, &ide_timer_expiry, (unsigned long)hwif);
+        timer_setup(&hwif->timer, ide_timer_expiry, 0);
 
         init_completion(&hwif->gendev_rel_comp);
 
diff --git a/drivers/mailbox/mailbox-altera.c b/drivers/mailbox/mailbox-altera.c
index bb682c926b0a..bcb29df9549e 100644
--- a/drivers/mailbox/mailbox-altera.c
+++ b/drivers/mailbox/mailbox-altera.c
@@ -57,6 +57,7 @@ struct altera_mbox {
 
         /* If the controller supports only RX polling mode */
         struct timer_list rxpoll_timer;
+        struct mbox_chan *chan;
 };
 
 static struct altera_mbox *mbox_chan_to_altera_mbox(struct mbox_chan *chan)
@@ -138,12 +139,11 @@ static void altera_mbox_rx_data(struct mbox_chan *chan)
         }
 }
 
-static void altera_mbox_poll_rx(unsigned long data)
+static void altera_mbox_poll_rx(struct timer_list *t)
 {
-        struct mbox_chan *chan = (struct mbox_chan *)data;
-        struct altera_mbox *mbox = mbox_chan_to_altera_mbox(chan);
+        struct altera_mbox *mbox = from_timer(mbox, t, rxpoll_timer);
 
-        altera_mbox_rx_data(chan);
+        altera_mbox_rx_data(mbox->chan);
 
         mod_timer(&mbox->rxpoll_timer,
                   jiffies + msecs_to_jiffies(MBOX_POLLING_MS));
@@ -206,8 +206,8 @@ static int altera_mbox_startup_receiver(struct mbox_chan *chan)
 
 polling:
         /* Setup polling timer */
-        setup_timer(&mbox->rxpoll_timer, altera_mbox_poll_rx,
-                    (unsigned long)chan);
+        mbox->chan = chan;
+        timer_setup(&mbox->rxpoll_timer, altera_mbox_poll_rx, 0);
         mod_timer(&mbox->rxpoll_timer,
                   jiffies + msecs_to_jiffies(MBOX_POLLING_MS));
 
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 8216ceb51b18..c2a17a79f0b2 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -102,7 +102,9 @@ static void omap_cf_timer(struct timer_list *t)
  */
 static irqreturn_t omap_cf_irq(int irq, void *_cf)
 {
-        omap_cf_timer(&_cf->timer);
+        struct omap_cf_socket *cf = (struct omap_cf_socket *)_cf;
+
+        omap_cf_timer(&cf->timer);
         return IRQ_HANDLED;
 }
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index dc152e4b7f73..cc412175d036 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1211,7 +1211,7 @@ extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout);
 
 extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);
 
-extern void ide_timer_expiry(unsigned long);
+extern void ide_timer_expiry(struct timer_list *t);
 extern irqreturn_t ide_intr(int irq, void *dev_id);
 extern void do_ide_request(struct request_queue *);
 extern void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq);