diff options
author | Vaishali Thakkar <vthakkar1994@gmail.com> | 2015-02-11 05:29:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-11 22:40:12 -0500 |
commit | 1d6c4cca41840c82e6967a48137f622547244630 (patch) | |
tree | d7c77722a04765ff73d7087e9de259bc7384cbea | |
parent | 163cff31de762a4e21df7050e392bf5f30f17e14 (diff) |
drivers/net: Use setup_timer and mod_timer
This patch introduces the use of functions setup_timer
and mod_timer.
This is done using Coccinelle and semantic patch used
for this as follows:
// <smpl>
@@
expression x,y,z,a,b;
@@
-init_timer (&x);
+setup_timer (&x, y, z);
+mod_timer (&a, b);
-x.function = y;
-x.data = z;
-x.expires = b;
-add_timer(&a);
// </smpl>
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/3com/3c589_cs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c index f18647c23559..c5a320507556 100644 --- a/drivers/net/ethernet/3com/3c589_cs.c +++ b/drivers/net/ethernet/3com/3c589_cs.c | |||
@@ -518,11 +518,8 @@ static int el3_open(struct net_device *dev) | |||
518 | netif_start_queue(dev); | 518 | netif_start_queue(dev); |
519 | 519 | ||
520 | tc589_reset(dev); | 520 | tc589_reset(dev); |
521 | init_timer(&lp->media); | 521 | setup_timer(&lp->media, media_check, (unsigned long)dev); |
522 | lp->media.function = media_check; | 522 | mod_timer(&lp->media, jiffies + HZ); |
523 | lp->media.data = (unsigned long) dev; | ||
524 | lp->media.expires = jiffies + HZ; | ||
525 | add_timer(&lp->media); | ||
526 | 523 | ||
527 | dev_dbg(&link->dev, "%s: opened, status %4.4x.\n", | 524 | dev_dbg(&link->dev, "%s: opened, status %4.4x.\n", |
528 | dev->name, inw(dev->base_addr + EL3_STATUS)); | 525 | dev->name, inw(dev->base_addr + EL3_STATUS)); |