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: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 2d4f2ae36d31..a126c7b9dbea 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -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);