Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

[linux-2.6-block.git] / drivers / net / ethernet / aquantia / atlantic / aq_pci_func.c

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index baa5f8cc31f219558989407c7b0dee17f6241ae5..43c71f6b314f9da85be103b67b370c63bdf6fb31 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -200,7 +200,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)
        if (self->pdev->msi_enabled)
                return AQ_HW_IRQ_MSI;
 
-       return AQ_HW_IRQ_LEGACY;
+       return AQ_HW_IRQ_INTX;
 }
 
 static void aq_pci_free_irq_vectors(struct aq_nic_s *self)
@@ -298,11 +298,8 @@ static int aq_pci_probe(struct pci_dev *pdev,
 
        numvecs += AQ_HW_SERVICE_IRQS;
        /*enable interrupts */
-#if !AQ_CFG_FORCE_LEGACY_INT
-       err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
-                                   PCI_IRQ_MSIX | PCI_IRQ_MSI |
-                                   PCI_IRQ_LEGACY);
-
+#if !AQ_CFG_FORCE_INTX
+       err = pci_alloc_irq_vectors(self->pdev, 1, numvecs, PCI_IRQ_ALL_TYPES);
        if (err < 0)
                goto err_hwinit;
        numvecs = err;