diff options
| author | Allen Pais | 2017-09-21 19:04:30 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-09-21 20:44:39 +0200 |
| commit | 07b6901f61813aa547c5a25e118f977022fec9eb (patch) | |
| tree | a76dddd9c0a3f8e10c4f06cabd6901672d252985 /drivers/net/ethernet/agere | |
| parent | drivers: net: am79c961: use setup_timer() helper. (diff) | |
| download | kernel-qcow2-linux-07b6901f61813aa547c5a25e118f977022fec9eb.tar.gz kernel-qcow2-linux-07b6901f61813aa547c5a25e118f977022fec9eb.tar.xz kernel-qcow2-linux-07b6901f61813aa547c5a25e118f977022fec9eb.zip | |
drivers: net: et131x: 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/agere')
| -rw-r--r-- | drivers/net/ethernet/agere/et131x.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c index 54eff90e2f02..658e92f79d36 100644 --- a/drivers/net/ethernet/agere/et131x.c +++ b/drivers/net/ethernet/agere/et131x.c @@ -3624,11 +3624,10 @@ static int et131x_open(struct net_device *netdev) int result; /* Start the timer to track NIC errors */ - init_timer(&adapter->error_timer); + setup_timer(&adapter->error_timer, et131x_error_timer_handler, + (unsigned long)adapter); adapter->error_timer.expires = jiffies + msecs_to_jiffies(TX_ERROR_PERIOD); - adapter->error_timer.function = et131x_error_timer_handler; - adapter->error_timer.data = (unsigned long)adapter; add_timer(&adapter->error_timer); result = request_irq(irq, et131x_isr, |