From: Vaishali Thakkar Date: Mon, 1 Jun 2015 04:58:37 +0000 (+0530) Subject: xen-netfront: Use setup_timer X-Git-Tag: v4.1.12-92~304^2^2^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8de1b209f22aa7cfdc9baa16d0186816e4e98e49;p=users%2Fjedix%2Flinux-maple.git xen-netfront: Use setup_timer 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 Signed-off-by: David S. Miller (cherry picked from commit 493be55ac3d81f9c32832237288eb397a9993d5d) Signed-off-by: Elena Ufimtseva --- diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index e9800ea74a8f..e2c23ab0cf65 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -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);