Commit e1aaf5ca authored by Javier González's avatar Javier González Committed by Christoph Hellwig
Browse files

nvme: remove unnecessary return values 



Cleanup unnecessary ret values that are not checked or used in
nvme_alloc_ns().

Signed-off-by: default avatarJavier González <javier.gonz@samsung.com>
Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f781f3dd

drivers/nvme/host/core.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

		}