IB/qib: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY

Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY macro.

Link: https://lore.kernel.org/r/20240325070944.3600338-12-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>

diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index 6af57067c32e182a4cc2228173cca352f1340d79..78dfe98ebcf7a73e0eb0bc0f0b5aee2d686da311 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -3281,7 +3281,7 @@ static int qib_7220_intr_fallback(struct qib_devdata *dd)
 
        qib_free_irq(dd);
        dd->msi_lo = 0;
-       if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_LEGACY) < 0)
+       if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX) < 0)
                qib_dev_err(dd, "Failed to enable INTx\n");
        qib_setup_7220_interrupt(dd);
        return 1;

diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index f93906d8fc0973ebddba949f74f1fda76fa5e480..9db29916e35a0c993cf97db9a1ebf0da81568656 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -3471,8 +3471,7 @@ try_intx:
                                    pci_irq_vector(dd->pcidev, msixnum),
                                    ret);
                        qib_7322_free_irq(dd);
-                       pci_alloc_irq_vectors(dd->pcidev, 1, 1,
-                                             PCI_IRQ_LEGACY);
+                       pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX);
                        goto try_intx;
                }
                dd->cspec->msix_entries[msixnum].arg = arg;
@@ -5143,7 +5142,7 @@ static int qib_7322_intr_fallback(struct qib_devdata *dd)
        qib_devinfo(dd->pcidev,
                "MSIx interrupt not detected, trying INTx interrupts\n");
        qib_7322_free_irq(dd);
-       if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_LEGACY) < 0)
+       if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX) < 0)
                qib_dev_err(dd, "Failed to enable INTx\n");
        qib_setup_7322_interrupt(dd, 0);
        return 1;

diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 47bf64ace05c8d0e10d25ca3765e05d160152d45..58c1d62d341bc399b8fed3a62c0bb9add4da8a3f 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -210,7 +210,7 @@ int qib_pcie_params(struct qib_devdata *dd, u32 minw, u32 *nent)
        }
 
        if (dd->flags & QIB_HAS_INTX)
-               flags |= PCI_IRQ_LEGACY;
+               flags |= PCI_IRQ_INTX;
        maxvec = (nent && *nent) ? *nent : 1;
        nvec = pci_alloc_irq_vectors(dd->pcidev, 1, maxvec, flags);
        if (nvec < 0)