scsi: use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES where appropriate
Subsystems (3)
PATCH 15/15 scsi: use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES where appropriate
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 <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- drivers/scsi/ipr.c | 2 +- drivers/scsi/vmw_pvscsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ipr.c +1 -1
@@ -10275,7 +10275,7 @@ static int ipr_probe_ioa(struct pci_dev *pdev, irq_flag =PCI_IRQ_LEGACY ;if (ioa_cfg->ipr_chip->has_msi) - irq_flag |=PCI_IRQ_MSI |PCI_IRQ_MSIX ; + irq_flag |=PCI_IRQ_MSI_TYPES ; rc =pci_alloc_irq_vectors (pdev,1 , ipr_number_of_msix, irq_flag);if (rc <0 ) {ipr_wait_for_pci_err_recovery (ioa_cfg);
drivers/scsi/vmw_pvscsi.c +1 -1
@@ -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 ;
Signature · 1 line
2.17.2
drivers/scsi/ipr.c static int ipr_probe_ioa(struct pci_dev *pdev, · line 10278
Quoted 8 lines · 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.
irq_flag = PCI_IRQ_LEGACY; if (ioa_cfg->ipr_chip->has_msi)drivers/scsi/ipr.c +1
-1- irq_flag |=PCI_IRQ_MSI |PCI_IRQ_MSIX ; + irq_flag |=PCI_IRQ_MSI_TYPES ;
Perhaps
if (ioa_cfg->ipr_chip->has_msi)
irq_flag = PCI_IRQ_ALL_TYPES;
else
irq_flag = PCI_IRQ_LEGACY;?
Quoted 19 lines
rc = pci_alloc_irq_vectors(pdev, 1, ipr_number_of_msix, irq_flag); if (rc < 0) { ipr_wait_for_pci_err_recovery(ioa_cfg);drivers/scsi/vmw_pvscsi.c +1
-2@@ -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
Signature · 2 lines
With Best Regards, Andy Shevchenko