aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 13:04:44 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-21 14:44:41 -0400
commit3e436a25fcca449cbb044c7483116772873f3e28 (patch)
tree22a5e0f94c07bd8466b65793c7d17fdb060f697e
parentba98e9e2eb32ba8f604f947fa656ef2071d22fa0 (diff)
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>
-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)
655 netdev_dbg(dev, "Done netdev_open()\n"); 655 netdev_dbg(dev, "Done netdev_open()\n");
656 656
657 /* Set the timer to check for link beat. */ 657 /* Set the timer to check for link beat. */
658 init_timer(&np->timer); 658 setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
659 np->timer.expires = jiffies + 1*HZ; 659 np->timer.expires = jiffies + 1*HZ;
660 np->timer.data = (unsigned long)dev;
661 np->timer.function = netdev_timer; /* timer handler */
662 add_timer(&np->timer); 660 add_timer(&np->timer);
663 return 0; 661 return 0;
664out_err: 662out_err: