|
@@ -1849,34 +1849,19 @@ static void atl1e_free_irq(struct atl1e_adapter *adapter)
|
|
|
struct net_device *netdev = adapter->netdev;
|
|
|
|
|
|
free_irq(adapter->pdev->irq, netdev);
|
|
|
-
|
|
|
- if (adapter->have_msi)
|
|
|
- pci_disable_msi(adapter->pdev);
|
|
|
}
|
|
|
|
|
|
static int atl1e_request_irq(struct atl1e_adapter *adapter)
|
|
|
{
|
|
|
struct pci_dev *pdev = adapter->pdev;
|
|
|
struct net_device *netdev = adapter->netdev;
|
|
|
- int flags = 0;
|
|
|
int err = 0;
|
|
|
|
|
|
- adapter->have_msi = true;
|
|
|
- err = pci_enable_msi(pdev);
|
|
|
- if (err) {
|
|
|
- netdev_dbg(netdev,
|
|
|
- "Unable to allocate MSI interrupt Error: %d\n", err);
|
|
|
- adapter->have_msi = false;
|
|
|
- }
|
|
|
-
|
|
|
- if (!adapter->have_msi)
|
|
|
- flags |= IRQF_SHARED;
|
|
|
- err = request_irq(pdev->irq, atl1e_intr, flags, netdev->name, netdev);
|
|
|
+ err = request_irq(pdev->irq, atl1e_intr, IRQF_SHARED, netdev->name,
|
|
|
+ netdev);
|
|
|
if (err) {
|
|
|
netdev_dbg(adapter->netdev,
|
|
|
"Unable to allocate interrupt Error: %d\n", err);
|
|
|
- if (adapter->have_msi)
|
|
|
- pci_disable_msi(pdev);
|
|
|
return err;
|
|
|
}
|
|
|
netdev_dbg(netdev, "atl1e_request_irq OK\n");
|