Commit ba326643 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme-core: remove unnecessary function parameter 



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

Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 50ab19d8

drivers/nvme/host/core.c

+3 −5
Original line number Diff line number Diff line
@@ -1049,8 +1049,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;
@@ -1090,7 +1089,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:
@@ -1206,12 +1205,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);