3c59x: 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/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 79e1a0282163db200916e0f862fa1560eab2fd03..c377607e674582d256449fd1a222f5f769f95918 100644 (file)
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1601,15 +1601,9 @@ vortex_up(struct net_device *dev)
                                dev->name, media_tbl[dev->if_port].name);
        }
 
-       init_timer(&vp->timer);
+       setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
        vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
-       vp->timer.data = (unsigned long)dev;
-       vp->timer.function = vortex_timer;              /* timer handler */
-       add_timer(&vp->timer);
-
-       init_timer(&vp->rx_oom_timer);
-       vp->rx_oom_timer.data = (unsigned long)dev;
-       vp->rx_oom_timer.function = rx_oom_timer;
+       setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
 
        if (vortex_debug > 1)
                pr_debug("%s: Initial media type %s.\n",