From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Fri, 27 Jan 2023 16:16:46 +0000 (+0900)
Subject: nvme: Use self-test code definition values instead hard-coded values
X-Git-Tag: v2.3~3^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f9ebfb945e2432e414fe6442c3e644750771db79;p=users%2Fsagi%2Fnvme-cli.git

nvme: Use self-test code definition values instead hard-coded values

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
---

diff --git a/nvme.c b/nvme.c
index 7aad55f2..d0f91fe8 100644
--- a/nvme.c
+++ b/nvme.c
@@ -4246,7 +4246,7 @@ static int device_self_test(int argc, char **argv, struct command *cmd, struct p
 
 	struct config cfg = {
 		.namespace_id	= NVME_NSID_ALL,
-		.stc		= 0,
+		.stc		= NVME_ST_CODE_RESERVED,
 		.wait		= false,
 	};
 
@@ -4261,7 +4261,7 @@ static int device_self_test(int argc, char **argv, struct command *cmd, struct p
 	if (err)
 		goto ret;
 
-	if (cfg.stc == 0) {
+	if (cfg.stc == NVME_ST_CODE_RESERVED) {
 		struct nvme_self_test_log log;
 		err = nvme_cli_get_log_device_self_test(dev, &log);
 		if (err) {
@@ -4295,9 +4295,9 @@ static int device_self_test(int argc, char **argv, struct command *cmd, struct p
 	if (!err) {
 		if (cfg.stc == 0xf)
 			printf("Aborting device self-test operation\n");
-		else if (cfg.stc == 0x2)
+		else if (cfg.stc == NVME_ST_CODE_EXTENDED)
 			printf("Extended Device self-test started\n");
-		else if (cfg.stc == 0x1)
+		else if (cfg.stc == NVME_ST_CODE_SHORT)
 			printf("Short Device self-test started\n");
 
 		if (cfg.wait)