nvme: delete output format version command option

This will change the JSON output to print verbose mode only.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

nvme-print-json.c

@@ -202,7 +202,7 @@ static void json_id_iocs_iocsc(struct json_object *obj_iocsc, __u64 iocsc)
 
 static bool verbose_mode(void)
 {
-	return json_print_ops.flags & VERBOSE || nvme_cfg.output_format_ver == 2;
+	return true;
 }
 
 static void json_id_iocs(struct nvme_id_iocs *iocs)

nvme.c

@@ -259,7 +259,6 @@ static const char *pmrmscu = "PMRMSCU=0xe18 register offset";
 
 struct nvme_config nvme_cfg = {
 	.output_format = "normal",
-	.output_format_ver = 1,
 	.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
 };
 

nvme.h

@@ -58,7 +58,6 @@ struct nvme_config {
 	__u32 timeout;
 	bool dry_run;
 	bool no_retries;
-	unsigned int output_format_ver;
 };
 
 /*
@@ -74,8 +73,6 @@ struct nvme_config {
 		OPT_FLAG("dry-run",        0, &nvme_cfg.dry_run,       dry_run),       \
 		OPT_FLAG("no-retries",     0, &nvme_cfg.no_retries,                    \
 			 "disable retry logic on errors\n"),                           \
-		OPT_UINT("output-format-version", 0, &nvme_cfg.output_format_ver,      \
-			 "output format version: 1|2"),                                \
 		OPT_END()                                                              \
 	}