1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 8b8689c6d887..18c85e55e76a 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -228,9 +228,9 @@ static bool xennet_can_sg(struct net_device *dev)
 }
 
 
-static void rx_refill_timeout(unsigned long data)
+static void rx_refill_timeout(struct timer_list *t)
 {
-        struct netfront_queue *queue = (struct netfront_queue *)data;
+        struct netfront_queue *queue = from_timer(queue, t, rx_refill_timer);
         napi_schedule(&queue->napi);
 }
 
@@ -1605,8 +1605,7 @@ static int xennet_init_queue(struct netfront_queue *queue)
         spin_lock_init(&queue->tx_lock);
         spin_lock_init(&queue->rx_lock);
 
-        setup_timer(&queue->rx_refill_timer, rx_refill_timeout,
-                    (unsigned long)queue);
+        timer_setup(&queue->rx_refill_timer, rx_refill_timeout, 0);
 
         snprintf(queue->name, sizeof(queue->name), "%s-q%u",
                  queue->info->netdev->name, queue->id);