Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block

Pull block driver update from Jens Axboe:
 "On top of the core pull request, here's the pull request for the
  driver related changes for 3.15.  It contains:

   - Improvements for msi-x registration for block drivers (mtip32xx,
     skd, cciss, nvme) from Alexander Gordeev.

   - A round of cleanups and improvements for drbd from Andreas
     Gruenbacher and Rashika Kheria.

   - A round of clanups and improvements for bcache from Kent.

   - Removal of sleep_on() and friends in DAC960, ataflop, swim3 from
     Arnd Bergmann.

   - Bug fix for a bug in the mtip32xx async completion code from Sam
     Bradshaw.

   - Bug fix for accidentally bouncing IO on 32-bit platforms with
     mtip32xx from Felipe Franciosi"

* 'for-3.15/drivers' of git://git.kernel.dk/linux-block: (103 commits)
  bcache: remove nested function usage
  bcache: Kill bucket->gc_gen
  bcache: Kill unused freelist
  bcache: Rework btree cache reserve handling
  bcache: Kill btree_io_wq
  bcache: btree locking rework
  bcache: Fix a race when freeing btree nodes
  bcache: Add a real GC_MARK_RECLAIMABLE
  bcache: Add bch_keylist_init_single()
  bcache: Improve priority_stats
  bcache: Better alloc tracepoints
  bcache: Kill dead cgroup code
  bcache: stop moving_gc marking buckets that can't be moved.
  bcache: Fix moving_pred()
  bcache: Fix moving_gc deadlocking with a foreground write
  bcache: Fix discard granularity
  bcache: Fix another bug recovering from unclean shutdown
  bcache: Fix a bug recovering from unclean shutdown
  bcache: Fix a journalling reclaim after recovery bug
  bcache: Fix a null ptr deref in journal replay
  ...

1 files changed, 9 insertions, 24 deletions

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 8459e4e7c719..da085ff10d25 100644
--- 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;
                 }
         }