diff options
| author | Amitoj Kaur Chawla <amitoj1606@gmail.com> | 2016-02-24 19:28:19 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-25 16:51:05 -0500 |
| commit | 5b6490def9168af6a1609df910a7800bcbc97977 (patch) | |
| tree | 4024d6954a2507f56b12f7a3bfe768ec0d6dd908 | |
| parent | de55558dc4e6562197bf0ea0fe249cbd7ccebae5 (diff) | |
| download | linux-5b6490def9168af6a1609df910a7800bcbc97977.tar.bz2 | |
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>
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 79e1a0282163..c377607e6745 100644 --- 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", |