Merge tag 'iommu-v4.15-rc1' of git://github.com/awilliam/linux-vfio

[sfrench/cifs-2.6.git] / drivers / mailbox / mailbox-altera.c

diff --git a/drivers/mailbox/mailbox-altera.c b/drivers/mailbox/mailbox-altera.c
index bb682c926b0a048ab1918ba13a89c140dff19d96..bcb29df9549eb80512a2c9b4c5d299e941a790c0 100644 (file)
--- 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));