summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 20:05:21 +0300
committerDavid S. Miller <davem@davemloft.net>2017-09-21 21:44:44 +0300
commit99e3aa1ea47d0804a69ea7948ddd1251bcd1a635 (patch)
treea6eb1d3223dec60911fada9a740555903435566f
parent7d8fb3a7742513bb5434be704e0b0bf785032f45 (diff)
downloadlinux-99e3aa1ea47d0804a69ea7948ddd1251bcd1a635.tar.xz
drivers: net: uli526x: 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/uli526x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
index 7fc248efc4ba..5fbbc0caba99 100644
--- a/drivers/net/ethernet/dec/tulip/uli526x.c
+++ b/drivers/net/ethernet/dec/tulip/uli526x.c
@@ -491,10 +491,8 @@ static int uli526x_open(struct net_device *dev)
netif_wake_queue(dev);
/* set and active a timer process */
- init_timer(&db->timer);
+ setup_timer(&db->timer, uli526x_timer, (unsigned long)dev);
db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
- db->timer.data = (unsigned long)dev;
- db->timer.function = uli526x_timer;
add_timer(&db->timer);
return 0;