|
@@ -1883,27 +1883,24 @@ static int atl1e_request_irq(struct atl1e_adapter *adapter)
|
|
|
int err = 0;
|
|
|
|
|
|
adapter->have_msi = true;
|
|
|
- err = pci_enable_msi(adapter->pdev);
|
|
|
+ err = pci_enable_msi(pdev);
|
|
|
if (err) {
|
|
|
- netdev_dbg(adapter->netdev,
|
|
|
+ netdev_dbg(netdev,
|
|
|
"Unable to allocate MSI interrupt Error: %d\n", err);
|
|
|
adapter->have_msi = false;
|
|
|
- } else
|
|
|
- netdev->irq = pdev->irq;
|
|
|
-
|
|
|
+ }
|
|
|
|
|
|
if (!adapter->have_msi)
|
|
|
flags |= IRQF_SHARED;
|
|
|
- err = request_irq(adapter->pdev->irq, atl1e_intr, flags,
|
|
|
- netdev->name, netdev);
|
|
|
+ err = request_irq(pdev->irq, atl1e_intr, flags, netdev->name, netdev);
|
|
|
if (err) {
|
|
|
netdev_dbg(adapter->netdev,
|
|
|
"Unable to allocate interrupt Error: %d\n", err);
|
|
|
if (adapter->have_msi)
|
|
|
- pci_disable_msi(adapter->pdev);
|
|
|
+ pci_disable_msi(pdev);
|
|
|
return err;
|
|
|
}
|
|
|
- netdev_dbg(adapter->netdev, "atl1e_request_irq OK\n");
|
|
|
+ netdev_dbg(netdev, "atl1e_request_irq OK\n");
|
|
|
return err;
|
|
|
}
|
|
|
|
|
@@ -2233,7 +2230,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
|
|
|
SET_NETDEV_DEV(netdev, &pdev->dev);
|
|
|
pci_set_drvdata(pdev, netdev);
|
|
|
|
|
|
- netdev->irq = pdev->irq;
|
|
|
netdev->netdev_ops = &atl1e_netdev_ops;
|
|
|
|
|
|
netdev->watchdog_timeo = AT_TX_WATCHDOG;
|
|
@@ -2319,7 +2315,6 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
|
|
|
netdev_err(netdev, "cannot map device registers\n");
|
|
|
goto err_ioremap;
|
|
|
}
|
|
|
- netdev->base_addr = (unsigned long)adapter->hw.hw_addr;
|
|
|
|
|
|
/* init mii data */
|
|
|
adapter->mii.dev = netdev;
|