Commit 6b46fa02 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

nvme: remove unused timeout parameter 



The function __nvme_submit_sync_cmd() has following list of callers
that sets the timeout value to 0 :-

        Callers               |   Timeout value
------------------------------------------------
nvme_submit_sync_cmd()        |        0
nvme_features()               |        0
nvme_sec_submit()             |        0
nvmf_reg_read32()             |        0
nvmf_reg_read64()             |        0
nvmf_reg_write32()            |        0
nvmf_connect_admin_queue()    |        0
nvmf_connect_io_queue()       |        0

Remove the timeout function parameter from __nvme_submit_sync_cmd() and
adjust the rest of code accordingly.

Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2c61c97f

drivers/nvme/host/core.c

+4 −8
Original line number Diff line number Diff line
@@ -990,8 +990,7 @@ static int nvme_execute_rq(struct request *rq, bool at_head) 
 */

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		union nvme_result *result, void *buffer, unsigned bufflen,

		unsigned timeout, int qid, int at_head,

		blk_mq_req_flags_t flags)

		int qid, int at_head, blk_mq_req_flags_t flags)

{

	struct request *req;

	int ret;
@@ -1006,9 +1005,6 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
		return PTR_ERR(req);

	nvme_init_request(req, cmd);



	if (timeout)

		req->timeout = timeout;



	if (buffer && bufflen) {

		ret = blk_rq_map_kern(q, req, buffer, bufflen, GFP_KERNEL);

		if (ret)
@@ -1028,7 +1024,7 @@ EXPORT_SYMBOL_GPL(__nvme_submit_sync_cmd); 
int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		void *buffer, unsigned bufflen)

{

	return __nvme_submit_sync_cmd(q, cmd, NULL, buffer, bufflen, 0,

	return __nvme_submit_sync_cmd(q, cmd, NULL, buffer, bufflen,

			NVME_QID_ANY, 0, 0);

}

EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd);
@@ -1466,7 +1462,7 @@ static int nvme_features(struct nvme_ctrl *dev, u8 op, unsigned int fid, 
	c.features.dword11 = cpu_to_le32(dword11);



	ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &res,

			buffer, buflen, 0, NVME_QID_ANY, 0, 0);

			buffer, buflen, NVME_QID_ANY, 0, 0);

	if (ret >= 0 && result)

		*result = le32_to_cpu(res.u32);

	return ret;
@@ -2103,7 +2099,7 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len, 
	cmd.common.cdw10 = cpu_to_le32(((u32)secp) << 24 | ((u32)spsp) << 8);

	cmd.common.cdw11 = cpu_to_le32(len);



	return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len, 0,

	return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len,

			NVME_QID_ANY, 1, 0);

}

EXPORT_SYMBOL_GPL(nvme_sec_submit);

drivers/nvme/host/fabrics.c

+5 −5
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val) 
	cmd.prop_get.fctype = nvme_fabrics_type_property_get;

	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0, 0,

	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0, 0);



	if (ret >= 0)
@@ -198,7 +198,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val) 
	cmd.prop_get.attrib = 1;

	cmd.prop_get.offset = cpu_to_le32(off);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0, 0,

	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,

			NVME_QID_ANY, 0, 0);



	if (ret >= 0)
@@ -243,7 +243,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val) 
	cmd.prop_set.offset = cpu_to_le32(off);

	cmd.prop_set.value = cpu_to_le64(val);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, NULL, NULL, 0, 0,

	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, NULL, NULL, 0,

			NVME_QID_ANY, 0, 0);

	if (unlikely(ret))

		dev_err(ctrl->device,
@@ -389,7 +389,7 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl) 
	strncpy(data->hostnqn, ctrl->opts->host->nqn, NVMF_NQN_SIZE);



	ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res,

			data, sizeof(*data), 0, NVME_QID_ANY, 1,

			data, sizeof(*data), NVME_QID_ANY, 1,

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

	if (ret) {

		nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),
@@ -450,7 +450,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) 
	strncpy(data->hostnqn, ctrl->opts->host->nqn, NVMF_NQN_SIZE);



	ret = __nvme_submit_sync_cmd(ctrl->connect_q, &cmd, &res,

			data, sizeof(*data), 0, qid, 1,

			data, sizeof(*data), qid, 1,

			BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);

	if (ret) {

		nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32),

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, 
		void *buf, unsigned bufflen);

int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,

		union nvme_result *result, void *buffer, unsigned bufflen,

		unsigned timeout, int qid, int at_head,

		int qid, int at_head,

		blk_mq_req_flags_t flags);

int nvme_set_features(struct nvme_ctrl *dev, unsigned int fid,

		      unsigned int dword11, void *buffer, size_t buflen,