src: drop result argument from submit API

The command submit API doesn't need to return explicitly the return
value, it's already in struct nvme_passthru_cmd.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/examples/mi-mctp-csi-test.c

@@ -91,7 +91,7 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 
 	nvme_init_get_log(&cmd, NVME_NSID_NONE, lid, NVME_CSI_NVM,
 			  buf, sizeof(buf));
-	rc = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE, NULL);
+	rc = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE);
 	if (rc) {
 		warn("can't perform Get Log page command");
 		return -1;

libnvme/examples/mi-mctp.c

@@ -216,7 +216,7 @@ int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
 	if (partial)
 		cmd.data_len = offsetof(struct nvme_id_ctrl, rab);
 
-	rc = nvme_submit_admin_passthru(hdl, &cmd, NULL);
+	rc = nvme_submit_admin_passthru(hdl, &cmd);
 	if (rc) {
 		warn("can't perform Admin Identify command");
 		return -1;
@@ -399,7 +399,7 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 
 	nvme_init_get_log(&cmd, NVME_NSID_NONE, lid, NVME_CSI_NVM,
 			  buf, sizeof(buf));
-	rc = nvme_get_log(hdl, &cmd, true, NVME_LOG_PAGE_PDU_SIZE, NULL);
+	rc = nvme_get_log(hdl, &cmd, true, NVME_LOG_PAGE_PDU_SIZE);
 	if (rc) {
 		warn("can't perform Get Log page command");
 		return -1;
@@ -566,7 +566,7 @@ int do_security_info(nvme_mi_ep_t ep, int argc, char **argv)
 	}
 
 	nvme_init_security_receive(&cmd, 0, 0, 0, 0, 0, data, data_len);
-	rc = nvme_submit_admin_passthru(hdl, &cmd, NULL);
+	rc = nvme_submit_admin_passthru(hdl, &cmd);
 	if (rc) {
 		warnx("can't perform Security Receive command: rc %d", rc);
 		return -1;

libnvme/src/nvme/fabrics.c

@@ -1134,7 +1134,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
 	nvme_msg(ctx, LOG_DEBUG, "%s: get header (try %d/%d)\n",
 		 name, retries, args->max_retries);
 	nvme_init_get_log_discovery(&cmd, 0, log, DISCOVERY_HEADER_LEN);
-	err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN, NULL);
+	err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN);
 	if (err) {
 		nvme_msg(ctx, LOG_INFO,
 			 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
@@ -1168,8 +1168,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
 		cmd.cdw10 |= NVME_FIELD_ENCODE(args->lsp,
 					       NVME_LOG_CDW10_LSP_SHIFT,
 					       NVME_LOG_CDW10_LSP_MASK);
-		err = nvme_get_log(hdl, &cmd, false,
-				   NVME_LOG_PAGE_PDU_SIZE, NULL);
+		err = nvme_get_log(hdl, &cmd, false, NVME_LOG_PAGE_PDU_SIZE);
 		if (err) {
 			nvme_msg(ctx, LOG_INFO,
 				 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
@@ -1184,7 +1183,7 @@ static int nvme_discovery_log(const struct nvme_get_discovery_args *args,
 		nvme_msg(ctx, LOG_DEBUG, "%s: get header again\n", name);
 
 		nvme_init_get_log_discovery(&cmd, 0, log, DISCOVERY_HEADER_LEN);
-		err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN, NULL);
+		err = nvme_get_log(hdl, &cmd, false, DISCOVERY_HEADER_LEN);
 		if (err) {
 			nvme_msg(ctx, LOG_INFO,
 				 "%s: discover try %d/%d failed, errno %d status 0x%x\n",
@@ -1669,7 +1668,7 @@ static int nvmf_dim(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u8 trtype,
 	nvmf_fill_die(die, c->s->h, tel, trtype, adrfam, reg_addr, tsas);
 
 	nvme_init_dim_send(&cmd, tas, dim, tdl);
-	return nvme_submit_admin_passthru(hdl, &cmd, NULL);
+	return nvme_submit_admin_passthru(hdl, &cmd);
 }
 
 /**

libnvme/src/nvme/ioctl.c

@@ -101,27 +101,24 @@ int nvme_get_nsid(struct nvme_transport_handle *hdl, __u32 *nsid)
 
 __attribute__((weak))
 int nvme_submit_passthru(struct nvme_transport_handle *hdl,
-		unsigned long ioctl_cmd, struct nvme_passthru_cmd *cmd,
-		__u64 *result)
+		unsigned long ioctl_cmd, struct nvme_passthru_cmd *cmd)
 {
-	int err = ioctl(hdl->fd, ioctl_cmd, cmd);
+	int err;
 
-	if (err >= 0 && result)
-		*result = cmd->result;
+	err = ioctl(hdl->fd, ioctl_cmd, cmd);
 	if (err < 0)
 		return -errno;
 	return err;
 }
 
 int nvme_submit_admin_passthru(struct nvme_transport_handle *hdl,
-		struct nvme_passthru_cmd *cmd, __u64 *result)
+		struct nvme_passthru_cmd *cmd)
 {
 	switch (hdl->type) {
 	case NVME_TRANSPORT_HANDLE_TYPE_DIRECT:
-		return nvme_submit_passthru(hdl, NVME_IOCTL_ADMIN64_CMD,
-			cmd, result);
+		return nvme_submit_passthru(hdl, NVME_IOCTL_ADMIN64_CMD, cmd);
 	case NVME_TRANSPORT_HANDLE_TYPE_MI:
-		return nvme_mi_admin_admin_passthru(hdl, cmd, result);
+		return nvme_mi_admin_admin_passthru(hdl, cmd);
 	default:
 		break;
 	}
@@ -246,7 +243,7 @@ static bool nvme_uring_is_usable(struct nvme_transport_handle *hdl)
 
 int nvme_get_log(struct nvme_transport_handle *hdl,
 		struct nvme_passthru_cmd *cmd, bool rae,
-		__u32 xfer_len, __u64 *result)
+		__u32 xfer_len)
 {
 	__u64 offset = 0, xfer, data_len = cmd->data_len;
 	__u64 start = (__u64)cmd->cdw13 << 32 | cmd->cdw12;
@@ -321,12 +318,12 @@ int nvme_get_log(struct nvme_transport_handle *hdl,
 			if (ret)
 				nvme_uring_cmd_exit(&ring);
 		} else {
-			ret = nvme_submit_admin_passthru(hdl, cmd, result);
+			ret = nvme_submit_admin_passthru(hdl, cmd);
 			if (ret)
 				return ret;
 		}
 #else /* CONFIG_LIBURING */
-		ret = nvme_submit_admin_passthru(hdl, cmd, result);
+		ret = nvme_submit_admin_passthru(hdl, cmd);
 #endif /* CONFIG_LIBURING */
 		if (ret)
 			return ret;
@@ -360,7 +357,7 @@ static int read_ana_chunk(struct nvme_transport_handle *hdl, enum nvme_log_ana_l
 		int ret;
 
 		nvme_init_get_log_ana(&cmd, lsp, *read - log, *read, len);
-		ret = nvme_get_log(hdl, &cmd, rae, NVME_LOG_PAGE_PDU_SIZE, NULL);
+		ret = nvme_get_log(hdl, &cmd, rae, NVME_LOG_PAGE_PDU_SIZE);
 		if (ret)
 			return ret;
 
@@ -472,7 +469,7 @@ int nvme_get_ana_log_atomic(struct nvme_transport_handle *hdl, bool rae, bool rg
 }
 
 int nvme_submit_io_passthru(struct nvme_transport_handle *hdl,
-		struct nvme_passthru_cmd *cmd, __u64 *result)
+		struct nvme_passthru_cmd *cmd)
 {
-	return nvme_submit_passthru(hdl, NVME_IOCTL_IO64_CMD, cmd, result);
+	return nvme_submit_passthru(hdl, NVME_IOCTL_IO64_CMD, cmd);
 }