Skip to content

Commit 1b7ebe9

Browse files
committed
netapp: avoid sprinkling ifdefs
Use empty json functions instead without json. Signed-off-by: Tokunori Ikegami <[email protected]>
1 parent 0250ca0 commit 1b7ebe9

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

plugins/netapp/netapp-nvme.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ static void netapp_get_ontap_labels(char *vsname, char *nspath,
248248
}
249249
}
250250

251-
#ifdef CONFIG_JSONC
252251
static void netapp_smdevice_json(struct json_object *devices, char *devname,
253252
char *arrayname, char *volname, int nsid, char *nguid,
254253
char *ctrl, char *astate, char *version, unsigned long long lba,
@@ -294,7 +293,6 @@ static void netapp_ontapdevice_json(struct json_object *devices, char *devname,
294293

295294
json_array_add_value_object(devices, device_attrs);
296295
}
297-
#endif /* CONFIG_JSONC */
298296

299297
static void netapp_smdevices_print_verbose(struct smdevice_info *devices,
300298
int count, int format, const char *devname)
@@ -442,7 +440,6 @@ static void netapp_smdevices_print_regular(struct smdevice_info *devices,
442440
}
443441
}
444442

445-
#ifdef CONFIG_JSONC
446443
static void netapp_smdevices_print_json(struct smdevice_info *devices,
447444
int count, const char *devname)
448445
{
@@ -511,9 +508,6 @@ static void netapp_smdevices_print_json(struct smdevice_info *devices,
511508
printf("\n");
512509
json_free_object(root);
513510
}
514-
#else /* CONFIG_JSONC */
515-
#define netapp_smdevices_print_json(devices, count, devname)
516-
#endif /* CONFIG_JSONC */
517511

518512
static void netapp_ontapdevices_print_verbose(struct ontapdevice_info *devices,
519513
int count, int format, const char *devname)
@@ -629,7 +623,6 @@ static void netapp_ontapdevices_print_regular(struct ontapdevice_info *devices,
629623
}
630624
}
631625

632-
#ifdef CONFIG_JSONC
633626
static void netapp_ontapdevices_print_json(struct ontapdevice_info *devices,
634627
int count, const char *devname)
635628
{
@@ -686,9 +679,6 @@ static void netapp_ontapdevices_print_json(struct ontapdevice_info *devices,
686679
printf("\n");
687680
json_free_object(root);
688681
}
689-
#else /* CONFIG_JSONC */
690-
#define netapp_ontapdevices_print_json(devices, count, devname)
691-
#endif /* CONFIG_JSONC */
692682

693683
static int nvme_get_ontap_c2_log(int fd, __u32 nsid, void *buf, __u32 buflen)
694684
{

0 commit comments

Comments
 (0)