huawei: enable huawei-nvme.c build without json-c dependencies checking

Only build json print codes with CONFIG_JSONC build option instead. Signed-off-by: Tokunori Ikegami <[email protected]>
linux-nvme · Dec 20, 2024 · 16ed7c5 · 16ed7c5
1 parent f3e05ae
commit 16ed7c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
@@ -117,6 +117,7 @@ static int huawei_get_nvme_info(int fd, struct huawei_list_item *item, const cha
 	return 0;
 }
 
+#ifdef CONFIG_JSONC
 static void format(char *formatter, size_t fmt_sz, char *tofmt, size_t tofmtsz)
 {
 	fmt_sz = snprintf(formatter, fmt_sz, "%-*.*s", (int)tofmtsz, (int)tofmtsz, tofmt);
@@ -177,6 +178,7 @@ static void huawei_json_print_list_items(struct huawei_list_item *list_items,
 	printf("\n");
 	json_free_object(root);
 }
+#endif /* CONFIG_JSONC */
 
 static void huawei_print_list_head(struct huawei_list_element_len element_len)
 {
@@ -351,9 +353,11 @@ static int huawei_list(int argc, char **argv, struct command *command,
 	}
 
 	if (huawei_num > 0) {
+#ifdef CONFIG_JSONC
 		if (fmt == JSON)
 			huawei_json_print_list_items(list_items, huawei_num);
 		else
+#endif /* CONFIG_JSONC */
 			huawei_print_list_items(list_items, huawei_num);
 	}
 out_free_list_items:

diff --git a/plugins/meson.build b/plugins/meson.build
@@ -2,7 +2,6 @@
 
 if json_c_dep.found()
   sources += [
-    'plugins/huawei/huawei-nvme.c',
     'plugins/intel/intel-nvme.c',
     'plugins/micron/micron-nvme.c',
     'plugins/nbft/nbft-plugin.c',
@@ -24,6 +23,7 @@ sources += [
   'plugins/dell/dell-nvme.c',
   'plugins/dera/dera-nvme.c',
   'plugins/fdp/fdp.c',
+  'plugins/huawei/huawei-nvme.c',
   'plugins/innogrit/innogrit-nvme.c',
   'plugins/inspur/inspur-nvme.c',
   'plugins/memblaze/memblaze-nvme.c',