]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
nvme: Use abort self-test code definition value instead hard-code value
authorTokunori Ikegami <ikegami.t@gmail.com>
Sat, 28 Jan 2023 02:02:04 +0000 (11:02 +0900)
committerDaniel Wagner <dwagner@suse.de>
Mon, 30 Jan 2023 12:36:12 +0000 (13:36 +0100)
Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
nvme.c

diff --git a/nvme.c b/nvme.c
index 6a51dfe64360b1612dd39ed0168075bc5e5c71bc..350e8239d0b5f53ba08e1e53bca135a5ebad8434 100644 (file)
--- 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);