summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/packetengines
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:05:02 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:42 +0200
commitf1ce56ce5d2a18f5d61ec335aaf5aad978fa9cd6 (patch)
tree1badaf6d3ea3ecbc652e1612ecc89bdf76d3e7d7 /drivers/net/ethernet/packetengines
parentdrivers: net: sis900: use setup_timer() helper. (diff)
downloadlinux-f1ce56ce5d2a18f5d61ec335aaf5aad978fa9cd6.tar.xz
linux-f1ce56ce5d2a18f5d61ec335aaf5aad978fa9cd6.zip
drivers: net: packetengines: 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/packetengines')
-rw-r--r--drivers/net/ethernet/packetengines/yellowfin.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index fa7770da6ef8..33c241f52a71 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -632,10 +632,8 @@ static int yellowfin_open(struct net_device *dev)
}
/* Set the timer to check for link beat. */
- init_timer(&yp->timer);
+ setup_timer(&yp->timer, yellowfin_timer, (unsigned long)dev);
yp->timer.expires = jiffies + 3*HZ;
- yp->timer.data = (unsigned long)dev;
- yp->timer.function = yellowfin_timer; /* timer handler */
add_timer(&yp->timer);
out:
return rc;