nvme: remove unnecessary return values

Commit Message

Javier González Nov. 11, 2020, 8:10 p.m. UTC

From: Javier González <[e-mail]>

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

Signed-off-by: Javier González <[e-mail]>
---
 drivers/nvme/host/core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Chaitanya Kulkarni Nov. 12, 2020, 4:11 a.m. UTC | #1

On 11/11/20 12:10, [e-mail] wrote:
> From: Javier González <[e-mail]>
>
> Cleanup unnecessary ret values that are not checked or used in
> nvme_alloc_ns()
>
> Signed-off-by: Javier González <javier

The ret value pattern is used to avoid the calls in the if () which is

not clean based on the comments I had in the past.

Javier González Nov. 12, 2020, 6:54 a.m. UTC | #2

> On 12 Nov 2020, at 05.11, Chaitanya Kulkarni <[e-mail]> wrote:
> 
> On 11/11/20 12:10, [e-mail] wrote:
>> From: Javier González <[e-mail]>
>> 
>> Cleanup unnecessary ret values that are not checked or used in
>> nvme_alloc_ns()
>> 
>> Signed-off-by: Javier González <javier
> 
> The ret value pattern is used to avoid the calls in the if () which is
> 
> not clean based on the comments I had in the past.

Thanks for the comment Chaitanya. I was working around this function and TBH I have never thought about it this way. 

Will add it to the toolbelt then.

Patch

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index fff90200497c..c9ea32c87e52 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3830,7 +3830,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;
@@ -3854,8 +3854,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);
 
@@ -3874,8 +3873,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;
 		}