summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dec
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:04:44 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:41 +0200
commit3e436a25fcca449cbb044c7483116772873f3e28 (patch)
tree22a5e0f94c07bd8466b65793c7d17fdb060f697e /drivers/net/ethernet/dec
parentdrivers: net: natsemi: use setup_timer() helper. (diff)
downloadlinux-3e436a25fcca449cbb044c7483116772873f3e28.tar.xz
linux-3e436a25fcca449cbb044c7483116772873f3e28.zip
drivers: net: winbond-840: 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/dec')
-rw-r--r--drivers/net/ethernet/dec/tulip/winbond-840.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 32d7229544fa..6f88d687b6d2 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -655,10 +655,8 @@ static int netdev_open(struct net_device *dev)
netdev_dbg(dev, "Done netdev_open()\n");
/* 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 + 1*HZ;
- np->timer.data = (unsigned long)dev;
- np->timer.function = netdev_timer; /* timer handler */
add_timer(&np->timer);
return 0;
out_err: