pmcraid: Use pci_enable_msix_range() instead of pci_enable_msix()
authorAlexander Gordeev <agordeev@redhat.com>
Mon, 18 Aug 2014 06:01:53 +0000 (08:01 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 16 Sep 2014 16:09:57 +0000 (09:09 -0700)
As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range()  or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/pmcraid.c

index 6e575edf29f437a2b2f5cc8e8cd013269d73edf5..bcb64eb1387f0565976449eb9a45941ec7186514 100644 (file)
@@ -4698,19 +4698,10 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance)
                for (i = 0; i < PMCRAID_NUM_MSIX_VECTORS; i++)
                        entries[i].entry = i;
 
-               rc = pci_enable_msix(pdev, entries, num_hrrq);
-               if (rc < 0)
+               num_hrrq = pci_enable_msix_range(pdev, entries, 1, num_hrrq);
+               if (num_hrrq < 0)
                        goto pmcraid_isr_legacy;
 
-               /* Check how many MSIX vectors are allocated and register
-                * msi-x handlers for each of them giving appropriate buffer
-                */
-               if (rc > 0) {
-                       num_hrrq = rc;
-                       if (pci_enable_msix(pdev, entries, num_hrrq))
-                               goto pmcraid_isr_legacy;
-               }
-
                for (i = 0; i < num_hrrq; i++) {
                        pinstance->hrrq_vector[i].hrrq_id = i;
                        pinstance->hrrq_vector[i].drv_inst = pinstance;