nvme: nvme_security_send use nvme_passthru_cmd directly

Drop nvme_security_send_args entirely.

Signed-off-by: Dennis Maisenbacher <[email protected]>

Author: MaisenbacherD

nvme-rpmb.c

@@ -275,21 +275,8 @@ struct rpmb_config_block_t {
 static int send_rpmb_req(nvme_link_t l, unsigned char tgt, int size,
 			 struct rpmb_data_frame_t *req)
 {
-	struct nvme_security_send_args args = {
-		.args_size	= sizeof(args),
-		.nsid		= 0,
-		.nssf		= tgt,
-		.spsp0		= RPMB_NVME_SPSP,
-		.spsp1		= 0,
-		.secp		= RPMB_NVME_SECP,
-		.tl		= 0,
-		.data_len	= size,
-		.data		= (void *)req,
-		.timeout	= NVME_DEFAULT_IOCTL_TIMEOUT,
-		.result		= NULL,
-	};
-
-	return nvme_security_send(l, &args);
+	return nvme_security_send(l, 0, tgt, RPMB_NVME_SPSP, 0, RPMB_NVME_SECP, 0,
+						   (void *)req, size, NULL);
 }
 
 static int recv_rpmb_rsp(nvme_link_t l, int tgt, int size,

nvme.c

@@ -6876,21 +6876,8 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
 		return -errno;
 	}
 
-	struct nvme_security_send_args args = {
-		.args_size	= sizeof(args),
-		.nsid		= cfg.namespace_id,
-		.nssf		= cfg.nssf,
-		.spsp0		= cfg.spsp & 0xff,
-		.spsp1		= cfg.spsp >> 8,
-		.secp		= cfg.secp,
-		.tl		= cfg.tl,
-		.data_len	= cfg.tl,
-		.data		= sec_buf,
-		.timeout	= nvme_cfg.timeout,
-		.result		= NULL,
-	};
-
-	err = nvme_security_send(l, &args);
+	err = nvme_security_send(l, cfg.namespace_id, cfg.nssf, cfg.spsp & 0xff,
+			cfg.spsp >> 8, cfg.secp, cfg.tl, sec_buf, cfg.tl, NULL);
 
 	if (err < 0)
 		nvme_show_error("security-send: %s", nvme_strerror(-err));