diff options
| author |   Vaishali Thakkar <vthakkar1994@gmail.com> | 2015-02-11 15:59:50 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-02-11 19:40:12 -0800 |
| commit | 1d6c4cca41840c82e6967a48137f622547244630 (patch) | |
| tree | d7c77722a04765ff73d7087e9de259bc7384cbea /drivers/net/ethernet/3com | |
| parent | drivers: net: xgene: Make xgene_enet_of_match depend on CONFIG_OF (diff) | |
| download | linux-dev-1d6c4cca41840c82e6967a48137f622547244630.tar.xz linux-dev-1d6c4cca41840c82e6967a48137f622547244630.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/3com')
| -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) netif_start_queue(dev); tc589_reset(dev); - init_timer(&lp->media); - lp->media.function = media_check; - lp->media.data = (unsigned long) dev; - lp->media.expires = jiffies + HZ; - add_timer(&lp->media); + setup_timer(&lp->media, media_check, (unsigned long)dev); + mod_timer(&lp->media, jiffies + HZ); dev_dbg(&link->dev, "%s: opened, status %4.4x.\n", dev->name, inw(dev->base_addr + EL3_STATUS)); |