[PATCH v2 03/15] PCI: Use PCI_IRQ_MSI_TYPES where appropriate

[Piotr Stankiewicz]

Seeing as there is shorthand available to use when asking for any type
of interrupt, or any type of message signalled interrupt, leverage it.

Signed-off-by: Piotr Stankiewicz <piotr.stankiew...@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevche...@intel.com>
Reviewed-by: Logan Gunthorpe <log...@deltatee.com>
---
 drivers/pci/msi.c               | 3 +--
 drivers/pci/pcie/portdrv_core.c | 4 ++--
 drivers/pci/switch/switchtec.c  | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 443cc324b196..9db9ce5dddb3 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1231,8 +1231,7 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, 
unsigned int min_vecs,
                }
        }
 
-       if (msix_vecs == -ENOSPC ||
-           (flags & (PCI_IRQ_MSI | PCI_IRQ_MSIX)) == PCI_IRQ_MSIX)
+       if (msix_vecs == -ENOSPC || (flags & PCI_IRQ_MSI_TYPES) == PCI_IRQ_MSIX)
                return msix_vecs;
        return msi_vecs;
 }
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 50a9522ab07d..2a38a918ba12 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -105,7 +105,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, 
int *irqs, int mask)
 
        /* Allocate the maximum possible number of MSI/MSI-X vectors */
        nr_entries = pci_alloc_irq_vectors(dev, 1, PCIE_PORT_MAX_MSI_ENTRIES,
-                       PCI_IRQ_MSIX | PCI_IRQ_MSI);
+                       PCI_IRQ_MSI_TYPES);
        if (nr_entries < 0)
                return nr_entries;
 
@@ -131,7 +131,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, 
int *irqs, int mask)
                pci_free_irq_vectors(dev);
 
                nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec,
-                               PCI_IRQ_MSIX | PCI_IRQ_MSI);
+                               PCI_IRQ_MSI_TYPES);
                if (nr_entries < 0)
                        return nr_entries;
        }
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index e69cac84b605..11fbe9c6b201 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -1442,8 +1442,7 @@ static int switchtec_init_isr(struct switchtec_dev *stdev)
                nirqs = 4;
 
        nvecs = pci_alloc_irq_vectors(stdev->pdev, 1, nirqs,
-                                     PCI_IRQ_MSIX | PCI_IRQ_MSI |
-                                     PCI_IRQ_VIRTUAL);
+                                     PCI_IRQ_MSI_TYPES | PCI_IRQ_VIRTUAL);
        if (nvecs < 0)
                return nvecs;
 
-- 
2.17.2