From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Sat, 28 Jan 2023 02:02:04 +0000 (+0900)
Subject: nvme: Use abort self-test code definition value instead hard-code value
X-Git-Tag: v2.3~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=01780e29b6c3c0bfdebc5fcd3d5fd922820fdd12;p=users%2Fsagi%2Fnvme-cli.git

nvme: Use abort self-test code definition value instead hard-code value

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

diff --git a/nvme.c b/nvme.c
index 6a51dfe6..350e8239 100644
--- a/nvme.c
+++ b/nvme.c
@@ -4248,7 +4248,7 @@ static void abort_self_test(struct nvme_dev_self_test_args *args)
 {
 	int err;
 
-	args->stc = 0xf,
+	args->stc = NVME_ST_CODE_ABORT,
 
 	err = nvme_dev_self_test(args);
 	if (!err) {
@@ -4330,14 +4330,14 @@ static int device_self_test(int argc, char **argv, struct command *cmd, struct p
 	};
 	err = nvme_dev_self_test(&args);
 	if (!err) {
-		if (cfg.stc == 0xf)
+		if (cfg.stc == NVME_ST_CODE_ABORT)
 			printf("Aborting device self-test operation\n");
 		else if (cfg.stc == NVME_ST_CODE_EXTENDED)
 			printf("Extended Device self-test started\n");
 		else if (cfg.stc == NVME_ST_CODE_SHORT)
 			printf("Short Device self-test started\n");
 
-		if (cfg.wait && cfg.stc != 0xf)
+		if (cfg.wait && cfg.stc != NVME_ST_CODE_ABORT)
 			err = wait_self_test(dev);
 	} else if (err > 0) {
 		nvme_show_status(err);