Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / block / nvme-core.c

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 8459e4e7c71940462134eb6a7ad68c86f03ebb7a..da085ff10d25159b7233c98771fe1964adb7cbde 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1836,31 +1836,16 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
        /* Deregister the admin queue's interrupt */
        free_irq(dev->entry[0].vector, adminq);
 
-       vecs = nr_io_queues;
-       for (i = 0; i < vecs; i++)
+       for (i = 0; i < nr_io_queues; i++)
                dev->entry[i].entry = i;
-       for (;;) {
-               result = pci_enable_msix(pdev, dev->entry, vecs);
-               if (result <= 0)
-                       break;
-               vecs = result;
-       }
-
-       if (result < 0) {
-               vecs = nr_io_queues;
-               if (vecs > 32)
-                       vecs = 32;
-               for (;;) {
-                       result = pci_enable_msi_block(pdev, vecs);
-                       if (result == 0) {
-                               for (i = 0; i < vecs; i++)
-                                       dev->entry[i].vector = i + pdev->irq;
-                               break;
-                       } else if (result < 0) {
-                               vecs = 1;
-                               break;
-                       }
-                       vecs = result;
+       vecs = pci_enable_msix_range(pdev, dev->entry, 1, nr_io_queues);
+       if (vecs < 0) {
+               vecs = pci_enable_msi_range(pdev, 1, min(nr_io_queues, 32));
+               if (vecs < 0) {
+                       vecs = 1;
+               } else {
+                       for (i = 0; i < vecs; i++)
+                               dev->entry[i].vector = i + pdev->irq;
                }
        }