Skip to contentSkip to conversation

nvme-core: remove unnecessary function parameter

PATCH Applied Chaitanya Kulkarni 3 participants 3 messages Jan 22, 2022 – Jan 26, 2022 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme-core: remove unnecessary function parameter

From: Chaitanya Kulkarni <[email protected]>

In function nvme_execute_rq() we don't use gendisk parameter at all. Remove the unsed parameter and adjust the calls.

---
 drivers/nvme/host/core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/nvme/host/core.c +3 -5
index 1759538b36fc..7990c08889da 100644
@@ -1048,8 +1048,7 @@ EXPORT_SYMBOL_GPL(nvme_setup_cmd);
  * >0: nvme controller's cqe status response
  * <0: kernel error in lieu of controller response
  */
-static int nvme_execute_rq(struct gendisk *disk, struct request *rq,
-		bool at_head)
+static int nvme_execute_rq(struct request *rq, bool at_head)
 {
 	blk_status_t status;
 
@@ -1089,7 +1088,7 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
 			goto out;
 	}
 
-	ret = nvme_execute_rq(NULL, req, at_head);
+	ret = nvme_execute_rq(req, at_head);
 	if (result && ret >= 0)
 		*result = nvme_req(req)->result;
  out:
@@ -1205,12 +1204,11 @@ int nvme_execute_passthru_rq(struct request *rq)
 	struct nvme_command *cmd = nvme_req(rq)->cmd;
 	struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl;
 	struct nvme_ns *ns = rq->q->queuedata;
-	struct gendisk *disk = ns ? ns->disk : NULL;
 	u32 effects;
 	int  ret;
 
 	effects = nvme_passthru_start(ctrl, ns, cmd->common.opcode);
-	ret = nvme_execute_rq(disk, rq, false);
+	ret = nvme_execute_rq(rq, false);
 	if (effects) /* nothing to be done for zero cmd effects */
 		nvme_passthru_end(ctrl, effects, cmd, ret);
 
Signature · 1 line
2.29.0