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 316e0c3fe048cfbad5ee4e3441e7954eb01440ee..c88abf5b64154c90dbcaeb536581b8da839b1713 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -35,7 +35,7 @@ char atl1e_driver_version[] = DRV_VERSION;
  * { Vendor ID, Device ID, SubVendor ID, SubDevice ID,
  *   Class, Class Mask, private data (not used) }
  */
-static DEFINE_PCI_DEVICE_TABLE(atl1e_pci_tbl) = {
+static const struct pci_device_id atl1e_pci_tbl[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},
        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},
        /* required last entry */
@@ -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);