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

Commit cbb6218f authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Remove dead code in nvme_dev_add 



There is no situation that could occur where we could error out of this
function and require cleaning up allocated namespaces.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent a9ef4343

drivers/block/nvme-core.c

+2 −9
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ static void nvme_free_queues(struct nvme_dev *dev) 
static int nvme_dev_add(struct nvme_dev *dev)

{

	int res, nn, i;

	struct nvme_ns *ns, *next;

	struct nvme_ns *ns;

	struct nvme_id_ctrl *ctrl;

	struct nvme_id_ns *id_ns;

	void *mem;
@@ -1533,7 +1533,7 @@ static int nvme_dev_add(struct nvme_dev *dev) 
	res = nvme_identify(dev, 0, 1, dma_addr);

	if (res) {

		res = -EIO;

		goto out_free;

		goto out;

	}



	ctrl = mem;
@@ -1568,13 +1568,6 @@ static int nvme_dev_add(struct nvme_dev *dev) 
	list_for_each_entry(ns, &dev->namespaces, list)

		add_disk(ns->disk);

	res = 0;

	goto out;



 out_free:

	list_for_each_entry_safe(ns, next, &dev->namespaces, list) {

		list_del(&ns->list);

		nvme_ns_free(ns);

	}



 out:

	dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr);