On 2020-06-02 3:20 a.m., Piotr Stankiewicz wrote: > 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.stankiewicz@xxxxxxxxx> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxx> Seems fine to me, for the switchtec portions: Reviewed-by: Logan Gunthorpe <logang@xxxxxxxxxxxx> > --- > drivers/pci/pcie/portdrv_core.c | 4 ++-- > drivers/pci/switch/switchtec.c | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > 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; > >
