summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dlink
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:04:36 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:40 +0200
commit88e8aa172596d2eda971d3553d52a8e877805e90 (patch)
treebe611fc791e1f9eeba508ce54920ceee3263ba02 /drivers/net/ethernet/dlink
parentdrivers: net: ixgb: use setup_timer() helper. (diff)
downloadlinux-88e8aa172596d2eda971d3553d52a8e877805e90.tar.xz
linux-88e8aa172596d2eda971d3553d52a8e877805e90.zip
drivers: net: sundance: 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/ethernet/dlink')
-rw-r--r--drivers/net/ethernet/dlink/sundance.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
index 2704bcf023be..6ca9e981ad57 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -913,10 +913,8 @@ static int netdev_open(struct net_device *dev)
ioread16(ioaddr + MACCtrl1), ioread16(ioaddr + MACCtrl0));
/* Set the timer to check for link beat. */
- init_timer(&np->timer);
+ setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
np->timer.expires = jiffies + 3*HZ;
- np->timer.data = (unsigned long)dev;
- np->timer.function = netdev_timer; /* timer handler */
add_timer(&np->timer);
/* Enable interrupts by setting the interrupt mask. */