redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Keith Busch 2013-05-01 13:07:49 -06:00 committed by Matthew Wilcox
parent a9ef4343af
commit cbb6218fd4
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/block/nvme-core.c
View File

@ -1515,7 +1515,7 @@ static void nvme_free_queues(struct nvme_dev *dev)
static int nvme_dev_add(struct nvme_dev *dev) static int nvme_dev_add(struct nvme_dev *dev)
{ {
int res, nn, i; int res, nn, i;
struct nvme_ns *ns, *next; struct nvme_ns *ns;
struct nvme_id_ctrl *ctrl; struct nvme_id_ctrl *ctrl;
struct nvme_id_ns *id_ns; struct nvme_id_ns *id_ns;
void *mem; void *mem;
@ -1533,7 +1533,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
res = nvme_identify(dev, 0, 1, dma_addr); res = nvme_identify(dev, 0, 1, dma_addr);
if (res) { if (res) {
res = -EIO; res = -EIO;
goto out_free; goto out;
} }
ctrl = mem; ctrl = mem;
@ -1568,13 +1568,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
list_for_each_entry(ns, &dev->namespaces, list) list_for_each_entry(ns, &dev->namespaces, list)
add_disk(ns->disk); add_disk(ns->disk);
res = 0; 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: out:
dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr); dma_free_coherent(&dev->pci_dev->dev, 8192, mem, dma_addr);