nvme: remove unused return code from nvme_alloc_ns

The return code of nvme_alloc_ns is never used, so change it
to void.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index a4d8c90ee7cc4b2d0f74e9a9a0de49a5e6916667..414076aaf52bf27baf51c2fc13668275583711cb 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3480,7 +3480,7 @@ static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns)
        return 0;
 }
 
-static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
+static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
        struct nvme_ns *ns;
        struct gendisk *disk;
@@ -3490,13 +3490,11 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 
        ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node);
        if (!ns)
-               return -ENOMEM;
+               return;
 
        ns->queue = blk_mq_init_queue(ctrl->tagset);
-       if (IS_ERR(ns->queue)) {
-               ret = PTR_ERR(ns->queue);
+       if (IS_ERR(ns->queue))
                goto out_free_ns;
-       }
 
        if (ctrl->opts && ctrl->opts->data_digest)
                ns->queue->backing_dev_info->capabilities
@@ -3519,10 +3517,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
        if (ret)
                goto out_free_queue;
 
-       if (id->ncap == 0) {
-               ret = -EINVAL;
+       if (id->ncap == 0)      /* no namespace (legacy quirk) */
                goto out_free_id;
-       }
 
        ret = nvme_init_ns_head(ns, nsid, id);
        if (ret)
@@ -3531,10 +3527,8 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
        nvme_set_disk_name(disk_name, ns, ctrl, &flags);
 
        disk = alloc_disk_node(0, node);
-       if (!disk) {
-               ret = -ENOMEM;
+       if (!disk)
                goto out_unlink_ns;
-       }
 
        disk->fops = &nvme_fops;
        disk->private_data = ns;
@@ -3565,7 +3559,7 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
        nvme_fault_inject_init(&ns->fault_inject, ns->disk->disk_name);
        kfree(id);
 
-       return 0;
+       return;
  out_put_disk:
        put_disk(ns->disk);
  out_unlink_ns:
@@ -3579,9 +3573,6 @@ static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
        blk_cleanup_queue(ns->queue);
  out_free_ns:
        kfree(ns);
-       if (ret > 0)
-               ret = blk_status_to_errno(nvme_error_status(ret));
-       return ret;
 }
 
 static void nvme_ns_remove(struct nvme_ns *ns)