OSDN Git Service

nvme: remove unnecessary return values
authorJavier González <javier.gonz@samsung.com>
Tue, 1 Dec 2020 12:56:07 +0000 (13:56 +0100)
committerChristoph Hellwig <hch@lst.de>
Tue, 1 Dec 2020 19:36:38 +0000 (20:36 +0100)
Cleanup unnecessary ret values that are not checked or used in
nvme_alloc_ns().

Signed-off-by: Javier González <javier.gonz@samsung.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c

index 279f4ae..6d0c902 100644 (file)
@@ -3872,7 +3872,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
        struct gendisk *disk;
        struct nvme_id_ns *id;
        char disk_name[DISK_NAME_LEN];
-       int node = ctrl->numa_node, flags = GENHD_FL_EXT_DEVT, ret;
+       int node = ctrl->numa_node, flags = GENHD_FL_EXT_DEVT;
 
        if (nvme_identify_ns(ctrl, nsid, ids, &id))
                return;
@@ -3896,8 +3896,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
        ns->ctrl = ctrl;
        kref_init(&ns->kref);
 
-       ret = nvme_init_ns_head(ns, nsid, ids, id->nmic & NVME_NS_NMIC_SHARED);
-       if (ret)
+       if (nvme_init_ns_head(ns, nsid, ids, id->nmic & NVME_NS_NMIC_SHARED))
                goto out_free_queue;
        nvme_set_disk_name(disk_name, ns, ctrl, &flags);
 
@@ -3916,8 +3915,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,
                goto out_put_disk;
 
        if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {
-               ret = nvme_nvm_register(ns, disk_name, node);
-               if (ret) {
+               if (nvme_nvm_register(ns, disk_name, node)) {
                        dev_warn(ctrl->device, "LightNVM init failure\n");
                        goto out_put_disk;
                }