atl1e: Use setup_timer

[deliverable/linux.git] / drivers / net / ethernet / atheros / atl1e / atl1e_main.c

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 2326579f94540568226bb4987759a2554fc5e6d3..c88abf5b64154c90dbcaeb536581b8da839b1713 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2373,9 +2373,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64);
 
-       init_timer(&adapter->phy_config_timer);
-       adapter->phy_config_timer.function = atl1e_phy_config;
-       adapter->phy_config_timer.data = (unsigned long) adapter;
+       setup_timer(&adapter->phy_config_timer, atl1e_phy_config,
+                   (unsigned long)adapter);
 
        /* get user settings */
        atl1e_check_options(adapter);