diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-21 11:44:45 -0700 |
| commit | ae3e24fd547e9f0b1443c1f004c29165180eb101 (patch) | |
| tree | 1483ff9602b04d34cd641a223624c4514721f76e /drivers/net/wan/lmc/lmc_main.c | |
| parent | 908a23efb76eed04f5b5173ecf09b6cbd05d886b (diff) | |
| parent | 19569c88b938145e90cc7d6ab45d7fa0edd07beb (diff) | |
Merge branch 'net-setup_timer'
Allen Pais says:
====================
net: use setup_timer() helper function.
This series uses setup_timer() helper function. The series
addresses the files under drivers/net/*.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/lmc/lmc_main.c')
| -rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 4698450c77d1..ae69d65158e6 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -1084,10 +1084,8 @@ static int lmc_open(struct net_device *dev) * Setup a timer for the watchdog on probe, and start it running. * Since lmc_ok == 0, it will be a NOP for now. */ - init_timer (&sc->timer); + setup_timer(&sc->timer, lmc_watchdog, (unsigned long)dev); sc->timer.expires = jiffies + HZ; - sc->timer.data = (unsigned long) dev; - sc->timer.function = lmc_watchdog; add_timer (&sc->timer); lmc_trace(dev, "lmc_open out"); |