diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 376924804f3f..3caa1d5893c4 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -1458,7 +1458,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1458 | else | 1458 | else |
1459 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); | 1459 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); |
1460 | err = request_irq(adapter->msix_entries[vector].vector, | 1460 | err = request_irq(adapter->msix_entries[vector].vector, |
1461 | &e1000_intr_msix_rx, 0, adapter->rx_ring->name, | 1461 | e1000_intr_msix_rx, 0, adapter->rx_ring->name, |
1462 | netdev); | 1462 | netdev); |
1463 | if (err) | 1463 | if (err) |
1464 | goto out; | 1464 | goto out; |
@@ -1471,7 +1471,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1471 | else | 1471 | else |
1472 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); | 1472 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); |
1473 | err = request_irq(adapter->msix_entries[vector].vector, | 1473 | err = request_irq(adapter->msix_entries[vector].vector, |
1474 | &e1000_intr_msix_tx, 0, adapter->tx_ring->name, | 1474 | e1000_intr_msix_tx, 0, adapter->tx_ring->name, |
1475 | netdev); | 1475 | netdev); |
1476 | if (err) | 1476 | if (err) |
1477 | goto out; | 1477 | goto out; |
@@ -1480,7 +1480,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1480 | vector++; | 1480 | vector++; |
1481 | 1481 | ||
1482 | err = request_irq(adapter->msix_entries[vector].vector, | 1482 | err = request_irq(adapter->msix_entries[vector].vector, |
1483 | &e1000_msix_other, 0, netdev->name, netdev); | 1483 | e1000_msix_other, 0, netdev->name, netdev); |
1484 | if (err) | 1484 | if (err) |
1485 | goto out; | 1485 | goto out; |
1486 | 1486 | ||
@@ -1511,7 +1511,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) | |||
1511 | e1000e_set_interrupt_capability(adapter); | 1511 | e1000e_set_interrupt_capability(adapter); |
1512 | } | 1512 | } |
1513 | if (adapter->flags & FLAG_MSI_ENABLED) { | 1513 | if (adapter->flags & FLAG_MSI_ENABLED) { |
1514 | err = request_irq(adapter->pdev->irq, &e1000_intr_msi, 0, | 1514 | err = request_irq(adapter->pdev->irq, e1000_intr_msi, 0, |
1515 | netdev->name, netdev); | 1515 | netdev->name, netdev); |
1516 | if (!err) | 1516 | if (!err) |
1517 | return err; | 1517 | return err; |
@@ -1521,7 +1521,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter) | |||
1521 | adapter->int_mode = E1000E_INT_MODE_LEGACY; | 1521 | adapter->int_mode = E1000E_INT_MODE_LEGACY; |
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | err = request_irq(adapter->pdev->irq, &e1000_intr, IRQF_SHARED, | 1524 | err = request_irq(adapter->pdev->irq, e1000_intr, IRQF_SHARED, |
1525 | netdev->name, netdev); | 1525 | netdev->name, netdev); |
1526 | if (err) | 1526 | if (err) |
1527 | e_err("Unable to allocate interrupt, Error: %d\n", err); | 1527 | e_err("Unable to allocate interrupt, Error: %d\n", err); |
@@ -2970,7 +2970,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) | |||
2970 | if (err) | 2970 | if (err) |
2971 | goto msi_test_failed; | 2971 | goto msi_test_failed; |
2972 | 2972 | ||
2973 | err = request_irq(adapter->pdev->irq, &e1000_intr_msi_test, 0, | 2973 | err = request_irq(adapter->pdev->irq, e1000_intr_msi_test, 0, |
2974 | netdev->name, netdev); | 2974 | netdev->name, netdev); |
2975 | if (err) { | 2975 | if (err) { |
2976 | pci_disable_msi(adapter->pdev); | 2976 | pci_disable_msi(adapter->pdev); |