Merge branch 'topic/timer_api' into for-linus

4 files changed, 8 insertions, 11 deletions

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index f681df8f0ed3..331f863c605e 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -364,9 +364,9 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
         local_irq_restore(flags);
 }
 
-static void imxdma_watchdog(unsigned long data)
+static void imxdma_watchdog(struct timer_list *t)
 {
-        struct imxdma_channel *imxdmac = (struct imxdma_channel *)data;
+        struct imxdma_channel *imxdmac = from_timer(imxdmac, t, watchdog);
         struct imxdma_engine *imxdma = imxdmac->imxdma;
         int channel = imxdmac->channel;
 
@@ -1153,9 +1153,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
                         }
 
                         imxdmac->irq = irq + i;
-                        init_timer(&imxdmac->watchdog);
-                        imxdmac->watchdog.function = &imxdma_watchdog;
-                        imxdmac->watchdog.data = (unsigned long)imxdmac;
+                        timer_setup(&imxdmac->watchdog, imxdma_watchdog, 0);
                 }
 
                 imxdmac->imxdma = imxdma;
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index f70cc74032ea..58d4ccd33672 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -474,7 +474,7 @@ int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs)
         if (time_is_before_jiffies(ioat_chan->timer.expires)
             && timer_pending(&ioat_chan->timer)) {
                 mod_timer(&ioat_chan->timer, jiffies + COMPLETION_TIMEOUT);
-                ioat_timer_event((unsigned long)ioat_chan);
+                ioat_timer_event(&ioat_chan->timer);
         }
 
         return -ENOMEM;
@@ -862,9 +862,9 @@ static void check_active(struct ioatdma_chan *ioat_chan)
                 mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);
 }
 
-void ioat_timer_event(unsigned long data)
+void ioat_timer_event(struct timer_list *t)
 {
-        struct ioatdma_chan *ioat_chan = to_ioat_chan((void *)data);
+        struct ioatdma_chan *ioat_chan = from_timer(ioat_chan, t, timer);
         dma_addr_t phys_complete;
         u64 status;
 
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 56200eefcf5e..1ab42ec2b7ff 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -406,10 +406,9 @@ enum dma_status
 ioat_tx_status(struct dma_chan *c, dma_cookie_t cookie,
                 struct dma_tx_state *txstate);
 void ioat_cleanup_event(unsigned long data);
-void ioat_timer_event(unsigned long data);
+void ioat_timer_event(struct timer_list *t);
 int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs);
 void ioat_issue_pending(struct dma_chan *chan);
-void ioat_timer_event(unsigned long data);
 
 /* IOAT Init functions */
 bool is_bwd_ioat(struct pci_dev *pdev);
diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
index 93e006c3441d..2f31d3d0caa6 100644
--- a/drivers/dma/ioat/init.c
+++ b/drivers/dma/ioat/init.c
@@ -760,7 +760,7 @@ ioat_init_channel(struct ioatdma_device *ioat_dma,
         dma_cookie_init(&ioat_chan->dma_chan);
         list_add_tail(&ioat_chan->dma_chan.device_node, &dma->channels);
         ioat_dma->idx[idx] = ioat_chan;
-        setup_timer(&ioat_chan->timer, ioat_timer_event, data);
+        timer_setup(&ioat_chan->timer, ioat_timer_event, 0);
         tasklet_init(&ioat_chan->cleanup_task, ioat_cleanup_event, data);
 }