nvme-pci: drop min() from nr_io_queues assignment

in nvme_setup_io_queues() the number of I/O queues is set to either 1 in
case of a quirky Apple device or to the min of nvme_max_io_queues() or
dev->nr_allocated_queues - 1.
This is unnecessarily complicated as dev->nr_allocated_queues is only
assigned once and is nvme_max_io_queues() + 1.

Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 5e6365dd0c8e9e7e5f7a40e4ac8aa93c2588dd38..90b3384350213174ebbdc602762fe93caeb4ffa1 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2113,8 +2113,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
        if (dev->ctrl.quirks & NVME_QUIRK_SHARED_TAGS)
                nr_io_queues = 1;
        else
-               nr_io_queues = min(nvme_max_io_queues(dev),
-                                  dev->nr_allocated_queues - 1);
+               nr_io_queues = dev->nr_allocated_queues - 1;
 
        result = nvme_set_queue_count(&dev->ctrl, &nr_io_queues);
        if (result < 0)