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

Commit 17a1ec08 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Christoph Hellwig
Browse files

nvme/fc: simplify error handling of nvme_fc_create_hw_io_queues 



Simplify the error handling of nvme_fc_create_hw_io_queues(), this saves us
one variable and one level of indentation.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviwed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent c7034898

drivers/nvme/host/fc.c

+8 −7
Original line number Diff line number Diff line
@@ -1491,19 +1491,20 @@ static int 
nvme_fc_create_hw_io_queues(struct nvme_fc_ctrl *ctrl, u16 qsize)

{

	struct nvme_fc_queue *queue = &ctrl->queues[1];

	int i, j, ret;

	int i, ret;



	for (i = 1; i < ctrl->queue_count; i++, queue++) {

		ret = __nvme_fc_create_hw_queue(ctrl, queue, i, qsize);

		if (ret) {

			for (j = i-1; j >= 0; j--)

				__nvme_fc_delete_hw_queue(ctrl,

						&ctrl->queues[j], j);

			return ret;

		}

		if (ret)

			goto delete_queues;

	}



	return 0;



delete_queues:

	for (; i >= 0; i--)

		__nvme_fc_delete_hw_queue(ctrl, &ctrl->queues[i], i);

	return ret;

}



static int