Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91a509f8 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-pci: refactor nvme_poll_irqdisable to make sparse happy 



By duplicating the nvme_process_cq in both branches we keep the
sparse lock context checking happy, so do it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent ed92ad37

drivers/nvme/host/pci.c

+6 −6
Original line number Diff line number Diff line
@@ -1089,15 +1089,15 @@ static int nvme_poll_irqdisable(struct nvme_queue *nvmeq, unsigned int tag) 
	 * using the CQ lock.  For normal interrupt driven threads we have

	 * to disable the interrupt to avoid racing with it.

	 */

	if (nvmeq->cq_vector == -1)

	if (nvmeq->cq_vector == -1) {

		spin_lock(&nvmeq->cq_poll_lock);

	else

		disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));

		found = nvme_process_cq(nvmeq, &start, &end, tag);

	if (nvmeq->cq_vector == -1)

		spin_unlock(&nvmeq->cq_poll_lock);

	else

	} else {

		disable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));

		found = nvme_process_cq(nvmeq, &start, &end, tag);

		enable_irq(pci_irq_vector(pdev, nvmeq->cq_vector));

	}



	nvme_complete_cqes(nvmeq, start, end);

	return found;