Messages in this thread Patch in this message | | | From | Piotr Stankiewicz <> | Subject | [PATCH v2 15/15] scsi: Use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES where appropriate | Date | Wed, 3 Jun 2020 13:50:16 +0200 |
| |
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@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> --- drivers/scsi/ipr.c | 5 +++-- drivers/scsi/vmw_pvscsi.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index d48a8fa997b9..8e8d66daabea 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -10273,9 +10273,10 @@ static int ipr_probe_ioa(struct pci_dev *pdev, ipr_number_of_msix = IPR_MAX_MSIX_VECTORS; } - irq_flag = PCI_IRQ_LEGACY; if (ioa_cfg->ipr_chip->has_msi) - irq_flag |= PCI_IRQ_MSI | PCI_IRQ_MSIX; + irq_flag = PCI_IRQ_ALL_TYPES; + else + irq_flag = PCI_IRQ_LEGACY; rc = pci_alloc_irq_vectors(pdev, 1, ipr_number_of_msix, irq_flag); if (rc < 0) { ipr_wait_for_pci_err_recovery(ioa_cfg); diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index c3f010df641e..825b7db9c713 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -1347,7 +1347,7 @@ static u32 pvscsi_get_max_targets(struct pvscsi_adapter *adapter) static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) { - unsigned int irq_flag = PCI_IRQ_MSIX | PCI_IRQ_MSI | PCI_IRQ_LEGACY; + unsigned int irq_flag = PCI_IRQ_ALL_TYPES; struct pvscsi_adapter *adapter; struct pvscsi_adapter adapter_temp; struct Scsi_Host *host = NULL; -- 2.17.2
| |