net: tulip: 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.

The Coccinelle semantic patch that fixes this problem is
as follows:

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

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

Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index b553409e04ad33ed50fafe3bdaa8de74d965e6eb..94d0eebef129fa2b5c27622d223e34c3d999c96f 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -505,9 +505,7 @@ media_picked:
        tp->timer.expires = RUN_AT(next_tick);
        add_timer(&tp->timer);
 #ifdef CONFIG_TULIP_NAPI
-       init_timer(&tp->oom_timer);
-        tp->oom_timer.data = (unsigned long)dev;
-        tp->oom_timer.function = oom_timer;
+       setup_timer(&tp->oom_timer, oom_timer, (unsigned long)dev);
 #endif
 }
 
@@ -782,9 +780,8 @@ static void tulip_down (struct net_device *dev)
 
        spin_unlock_irqrestore (&tp->lock, flags);
 
-       init_timer(&tp->timer);
-       tp->timer.data = (unsigned long)dev;
-       tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
+       setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,
+                   (unsigned long)dev);
 
        dev->if_port = tp->saved_if_port;
 
@@ -1475,9 +1472,8 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        tp->csr0 = csr0;
        spin_lock_init(&tp->lock);
        spin_lock_init(&tp->mii_lock);
-       init_timer(&tp->timer);
-       tp->timer.data = (unsigned long)dev;
-       tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
+       setup_timer(&tp->timer, tulip_tbl[tp->chip_id].media_timer,
+                   (unsigned long)dev);
 
        INIT_WORK(&tp->media_work, tulip_tbl[tp->chip_id].media_task);