cw1200: queue: Use setup_timer

Convert a call to init_timer and accompanying intializations of
the timer's data and function fields to a call to setup_timer.

A simplified version of the semantic match that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression t,f,d;
@@

-init_timer(&t);
+setup_timer(&t,f,d);
-t.data = d;
-t.function = f;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/cw1200/queue.c b/drivers/net/wireless/cw1200/queue.c
index 9c3925f58d795187a0d145fa32b28f42f2c05ecc..0ba5ef9b3e7b1373f76742b4842a19d8e227b578 100644 (file)
--- a/drivers/net/wireless/cw1200/queue.c
+++ b/drivers/net/wireless/cw1200/queue.c
@@ -179,9 +179,7 @@ int cw1200_queue_init(struct cw1200_queue *queue,
        INIT_LIST_HEAD(&queue->pending);
        INIT_LIST_HEAD(&queue->free_pool);
        spin_lock_init(&queue->lock);
-       init_timer(&queue->gc);
-       queue->gc.data = (unsigned long)queue;
-       queue->gc.function = cw1200_queue_gc;
+       setup_timer(&queue->gc, cw1200_queue_gc, (unsigned long)queue);
 
        queue->pool = kzalloc(sizeof(struct cw1200_queue_item) * capacity,
                        GFP_KERNEL);