]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
xen-netfront: Use setup_timer
authorVaishali Thakkar <vthakkar1994@gmail.com>
Mon, 1 Jun 2015 04:58:37 +0000 (10:28 +0530)
committerElena Ufimtseva <elena.ufimtseva@oracle.com>
Wed, 12 Aug 2015 11:58:31 +0000 (07:58 -0400)
Use the timer API function setup_timer instead of structure field
assignments to initialize a timer.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@change@
expression e, func, da;
@@

-init_timer (&e);
+setup_timer (&e, func, da);
-e.data = da;
-e.function = func;

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 493be55ac3d81f9c32832237288eb397a9993d5d)
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
drivers/net/xen-netfront.c

index e9800ea74a8f2cc2aebaf2456942dd14f3c2d23a..e2c23ab0cf659a06aa2269bdf656a90bc0925957 100644 (file)
@@ -1559,9 +1559,8 @@ static int xennet_init_queue(struct netfront_queue *queue)
        spin_lock_init(&queue->tx_lock);
        spin_lock_init(&queue->rx_lock);
 
-       init_timer(&queue->rx_refill_timer);
-       queue->rx_refill_timer.data = (unsigned long)queue;
-       queue->rx_refill_timer.function = rx_refill_timeout;
+       setup_timer(&queue->rx_refill_timer, rx_refill_timeout,
+                   (unsigned long)queue);
 
        snprintf(queue->name, sizeof(queue->name), "%s-q%u",
                 queue->info->netdev->name, queue->id);