diff options
| author | Allen Pais | 2017-09-21 19:04:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-09-21 20:44:41 +0200 |
| commit | 4a9c07ed71c2b8d755ee585264f80dd2d82a8066 (patch) | |
| tree | b298107becc1b1ba1775aef8550612e515966d96 /drivers/net/ethernet/intel/e1000e | |
| parent | drivers: net: qlogic: use setup_timer() helper. (diff) | |
| download | kernel-qcow2-linux-4a9c07ed71c2b8d755ee585264f80dd2d82a8066.tar.gz kernel-qcow2-linux-4a9c07ed71c2b8d755ee585264f80dd2d82a8066.tar.xz kernel-qcow2-linux-4a9c07ed71c2b8d755ee585264f80dd2d82a8066.zip | |
drivers: net: e1000e: 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/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 327dfe5bedc0..8436c5f2c3e8 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7252,13 +7252,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_eeprom; } - init_timer(&adapter->watchdog_timer); - adapter->watchdog_timer.function = e1000_watchdog; - adapter->watchdog_timer.data = (unsigned long)adapter; - - init_timer(&adapter->phy_info_timer); - adapter->phy_info_timer.function = e1000_update_phy_info; - adapter->phy_info_timer.data = (unsigned long)adapter; + setup_timer(&adapter->watchdog_timer, e1000_watchdog, + (unsigned long)adapter); + setup_timer(&adapter->phy_info_timer, e1000_update_phy_info, + (unsigned long)adapter); INIT_WORK(&adapter->reset_task, e1000_reset_task); INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task); |