Commit 7d879c90 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-pci: rename nvme_disable_io_queues 



This function really deletes the I/O queues, so rename it to match
the functionality.  Also move the main wrapper right next to the
actual underlying implementation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent 10981f23

drivers/nvme/host/pci.c

+10 −10
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ struct nvme_dev; 
struct nvme_queue;



static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown);

static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode);

static void nvme_delete_io_queues(struct nvme_dev *dev);



/*

 * Represents an NVM Express device.  Each nvme_dev is a PCI function.
@@ -2310,12 +2310,6 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) 
			      PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd);

}



static void nvme_disable_io_queues(struct nvme_dev *dev)

{

	if (__nvme_disable_io_queues(dev, nvme_admin_delete_sq))

		__nvme_disable_io_queues(dev, nvme_admin_delete_cq);

}



static unsigned int nvme_max_io_queues(struct nvme_dev *dev)

{

	/*
@@ -2423,7 +2417,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) 


	if (dev->online_queues - 1 < dev->max_qid) {

		nr_io_queues = dev->online_queues - 1;

		nvme_disable_io_queues(dev);

		nvme_delete_io_queues(dev);

		result = nvme_setup_io_queues_trylock(dev);

		if (result)

			return result;
@@ -2487,7 +2481,7 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) 
	return 0;

}



static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode)

static bool __nvme_delete_io_queues(struct nvme_dev *dev, u8 opcode)

{

	int nr_queues = dev->online_queues - 1, sent = 0;

	unsigned long timeout;
@@ -2515,6 +2509,12 @@ static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode) 
	return true;

}



static void nvme_delete_io_queues(struct nvme_dev *dev)

{

	if (__nvme_delete_io_queues(dev, nvme_admin_delete_sq))

		__nvme_delete_io_queues(dev, nvme_admin_delete_cq);

}



static void nvme_pci_alloc_tag_set(struct nvme_dev *dev)

{

	struct blk_mq_tag_set * set = &dev->tagset;
@@ -2687,7 +2687,7 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	nvme_quiesce_io_queues(&dev->ctrl);



	if (!dead && dev->ctrl.queue_count > 0) {

		nvme_disable_io_queues(dev);

		nvme_delete_io_queues(dev);

		nvme_disable_ctrl(&dev->ctrl, shutdown);

		nvme_poll_irqdisable(&dev->queues[0]);

	}