summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:05:14 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:43 +0200
commitf2803332f2ef86ad29e247350f697bad4eb1aa93 (patch)
tree6bc36b3401b60062d5902afea2bf720b74598e9d /drivers/net/wan
parentdrivers: net: appletalk: use setup_timer() helper. (diff)
downloadlinux-f2803332f2ef86ad29e247350f697bad4eb1aa93.tar.xz
linux-f2803332f2ef86ad29e247350f697bad4eb1aa93.zip
drivers: net: dscc: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/dscc4.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index a043fb1367bd..64f176496da4 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -1127,10 +1127,8 @@ static int dscc4_open(struct net_device *dev)
done:
netif_start_queue(dev);
- init_timer(&dpriv->timer);
+ setup_timer(&dpriv->timer, dscc4_timer, (unsigned long)dev);
dpriv->timer.expires = jiffies + 10*HZ;
- dpriv->timer.data = (unsigned long)dev;
- dpriv->timer.function = dscc4_timer;
add_timer(&dpriv->timer);
netif_carrier_on(dev);