aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/fealnx.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 22:35:06 +0530
committerDavid S. Miller <davem@davemloft.net>2017-09-21 11:44:43 -0700
commit34b0cf069d174b2615769102d75b4ce687addeb9 (patch)
treebb05ec7dfe72ee0fb35e7c7e003e0f8cefe5cfc4 /drivers/net/ethernet/fealnx.c
parentdrivers: net: pxa168: use setup_timer() helper. (diff)
downloadlinux-dev-34b0cf069d174b2615769102d75b4ce687addeb9.tar.xz
linux-dev-34b0cf069d174b2615769102d75b4ce687addeb9.zip
drivers: net: fealnx: 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/fealnx.c')
-rw-r--r--drivers/net/ethernet/fealnx.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index e92859dab7ae..c8982313d850 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -909,17 +909,13 @@ static int netdev_open(struct net_device *dev)
printk(KERN_DEBUG "%s: Done netdev_open().\n", dev->name);
/* Set the timer to check for link beat. */
- init_timer(&np->timer);
+ setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
np->timer.expires = RUN_AT(3 * HZ);
- np->timer.data = (unsigned long) dev;
- np->timer.function = netdev_timer;
/* timer handler */
add_timer(&np->timer);
- init_timer(&np->reset_timer);
- np->reset_timer.data = (unsigned long) dev;
- np->reset_timer.function = reset_timer;
+ setup_timer(&np->reset_timer, reset_timer, (unsigned long)dev);
np->reset_timer_armed = 0;
return rc;
}