]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
skd: Use pci_enable_msix_exact() instead of pci_enable_msix_range()
authorAlexander Gordeev <agordeev@redhat.com>
Mon, 21 Apr 2014 15:19:31 +0000 (17:19 +0200)
committerJens Axboe <axboe@fb.com>
Tue, 22 Apr 2014 01:02:05 +0000 (19:02 -0600)
Function pci_enable_msix_exact() is a variation of
pci_enable_msix_range() that allows a device driver
to request a particular number of MSI-X interrupts,
rather than any number within a specified range.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/skd_main.c

index 36bcedfd930c82196031526d1617061df1f265ed..1dcf9067cffa26cc5a31c3258c7e100d83a2b09a 100644 (file)
@@ -3944,15 +3944,14 @@ static int skd_acquire_msix(struct skd_device *skdev)
        for (i = 0; i < SKD_MAX_MSIX_COUNT; i++)
                entries[i].entry = i;
 
-       rc = pci_enable_msix_range(pdev, entries,
-                                  SKD_MIN_MSIX_COUNT, SKD_MAX_MSIX_COUNT);
-       if (rc < 0) {
+       rc = pci_enable_msix_exact(pdev, entries, SKD_MAX_MSIX_COUNT);
+       if (rc) {
                pr_err("(%s): failed to enable MSI-X %d\n",
                       skd_name(skdev), rc);
                goto msix_out;
        }
 
-       skdev->msix_count = rc;
+       skdev->msix_count = SKD_MAX_MSIX_COUNT;
        skdev->msix_entries = kzalloc(sizeof(struct skd_msix_entry) *
                                      skdev->msix_count, GFP_KERNEL);
        if (!skdev->msix_entries) {