|
@@ -1436,13 +1436,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
|
|
atl2_check_options(adapter);
|
|
|
|
|
|
- init_timer(&adapter->watchdog_timer);
|
|
|
- adapter->watchdog_timer.function = atl2_watchdog;
|
|
|
- adapter->watchdog_timer.data = (unsigned long) adapter;
|
|
|
+ setup_timer(&adapter->watchdog_timer, atl2_watchdog,
|
|
|
+ (unsigned long)adapter);
|
|
|
|
|
|
- init_timer(&adapter->phy_config_timer);
|
|
|
- adapter->phy_config_timer.function = atl2_phy_config;
|
|
|
- adapter->phy_config_timer.data = (unsigned long) adapter;
|
|
|
+ setup_timer(&adapter->phy_config_timer, atl2_phy_config,
|
|
|
+ (unsigned long)adapter);
|
|
|
|
|
|
INIT_WORK(&adapter->reset_task, atl2_reset_task);
|
|
|
INIT_WORK(&adapter->link_chg_task, atl2_link_chg_task);
|