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_args.output_format_ver == 2;
+	return true;
 }
 
 static void json_id_iocs(struct nvme_id_iocs *iocs)

nvme.c

@@ -254,7 +254,6 @@ static const char *ish = "Ignore Shutdown (for NVMe-MI command)";
 
 struct nvme_args nvme_args = {
 	.output_format = "normal",
-	.output_format_ver = 1,
 	.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
 };
 

nvme.h

@@ -59,7 +59,6 @@ struct nvme_args {
 	bool dry_run;
 	bool no_retries;
 	bool no_ioctl_probing;
-	unsigned int output_format_ver;
 };
 
 #ifdef CONFIG_JSONC
@@ -87,8 +86,6 @@ struct nvme_args {
 			 "disable retry logic on errors"),                             \
 		OPT_FLAG("no-ioctl-probing", 0, &nvme_args.no_ioctl_probing,           \
 			 "disable 64-bit IOCTL support probing"),                      \
-		OPT_UINT("output-format-version", 0, &nvme_args.output_format_ver,     \
-			 "output format version: 1|2"),                                \
 		OPT_END()                                                              \
 	}