|
@@ -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);
|