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/eql.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/eql.c')
| -rw-r--r-- | drivers/net/eql.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index fe13bfea30ac..fccce4b47778 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c @@ -178,10 +178,8 @@ static void __init eql_setup(struct net_device *dev) { equalizer_t *eql = netdev_priv(dev); - init_timer(&eql->timer); - eql->timer.data = (unsigned long) eql; + setup_timer(&eql->timer, eql_timer, (unsigned long)eql); eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL; - eql->timer.function = eql_timer; spin_lock_init(&eql->queue.lock); INIT_LIST_HEAD(&eql->queue.all_slaves); |