diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2012-03-09 13:22:31 -0500 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-04-07 05:45:23 -0400 |
commit | 93f7fab433606a0ee6153788213de2a822736322 (patch) | |
tree | c89ec86b5ae06ef83adc2ab517116f74b67e8a79 /drivers | |
parent | 03a2384e68f8cd464320c79c8c8c9f75f7172fa5 (diff) |
atl1c: stop using net_device.{base_addr, irq}.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 1ef0c9275dee..ef5b85b9569e 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -2307,8 +2307,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter) | |||
2307 | "Unable to allocate MSI interrupt Error: %d\n", | 2307 | "Unable to allocate MSI interrupt Error: %d\n", |
2308 | err); | 2308 | err); |
2309 | adapter->have_msi = false; | 2309 | adapter->have_msi = false; |
2310 | } else | 2310 | } |
2311 | netdev->irq = pdev->irq; | ||
2312 | 2311 | ||
2313 | if (!adapter->have_msi) | 2312 | if (!adapter->have_msi) |
2314 | flags |= IRQF_SHARED; | 2313 | flags |= IRQF_SHARED; |
@@ -2616,7 +2615,6 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev) | |||
2616 | SET_NETDEV_DEV(netdev, &pdev->dev); | 2615 | SET_NETDEV_DEV(netdev, &pdev->dev); |
2617 | pci_set_drvdata(pdev, netdev); | 2616 | pci_set_drvdata(pdev, netdev); |
2618 | 2617 | ||
2619 | netdev->irq = pdev->irq; | ||
2620 | netdev->netdev_ops = &atl1c_netdev_ops; | 2618 | netdev->netdev_ops = &atl1c_netdev_ops; |
2621 | netdev->watchdog_timeo = AT_TX_WATCHDOG; | 2619 | netdev->watchdog_timeo = AT_TX_WATCHDOG; |
2622 | atl1c_set_ethtool_ops(netdev); | 2620 | atl1c_set_ethtool_ops(netdev); |
@@ -2706,7 +2704,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev, | |||
2706 | dev_err(&pdev->dev, "cannot map device registers\n"); | 2704 | dev_err(&pdev->dev, "cannot map device registers\n"); |
2707 | goto err_ioremap; | 2705 | goto err_ioremap; |
2708 | } | 2706 | } |
2709 | netdev->base_addr = (unsigned long)adapter->hw.hw_addr; | ||
2710 | 2707 | ||
2711 | /* init mii data */ | 2708 | /* init mii data */ |
2712 | adapter->mii.dev = netdev; | 2709 | adapter->mii.dev = netdev; |