nvme-print: Move num argument parsing into callbacks

The goal for the libnvme type print function is only to use
the types from the library as argument. The num argument can be
parsed from the ctrl_list thus move it the callbacks directly.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/nvme-print-binary.c b/nvme-print-binary.c
index dbb56ba9a1dafa2b7595bd6b7b6c4176676ee3be..616d7313bcd26ff2ccd16541f8645f1592d7a322 100644 (file)
--- a/nvme-print-binary.c
+++ b/nvme-print-binary.c
@@ -165,7 +165,7 @@ static void binary_zns_report_zones(void *report, __u32 descs,
        d_raw((unsigned char *)report, report_size);
 }
 
-static void binary_list_ctrl(struct nvme_ctrl_list *ctrl_list, __u16 num)
+static void binary_list_ctrl(struct nvme_ctrl_list *ctrl_list)
 {
        d_raw((unsigned char *)ctrl_list, sizeof(*ctrl_list));
 }

diff --git a/nvme-print-json.c b/nvme-print-json.c
index cffe1e1e4cd9bdabac7f86105759fb2eaa8274fc..923b28ecf53a9c1bfac520a96f8014b3408e6508 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -2204,8 +2204,9 @@ static void json_nvme_zns_report_zones(void *report, __u32 descs,
        }
 }
 
-static void json_nvme_list_ctrl(struct nvme_ctrl_list *ctrl_list, __u16 num)
+static void json_nvme_list_ctrl(struct nvme_ctrl_list *ctrl_list)
 {
+       __u16 num = le16_to_cpu(ctrl_list->num);
        struct json_object *root;
        struct json_object *valid_attrs;
        struct json_object *valid;

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index e25b9b9264f8088cf8e2fe70e24d982674f209ca..877ba75144885e3dafc927b1ded4a0d29b990fa3 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -3073,9 +3073,9 @@ static void stdout_zns_report_zones(void *report, __u32 descs,
        }
 }
 
-static void stdout_list_ctrl(struct nvme_ctrl_list *ctrl_list,
-                            __u16 num)
+static void stdout_list_ctrl(struct nvme_ctrl_list *ctrl_list)
 {
+       __u16 num = le16_to_cpu(ctrl_list->num);
        int i;
 
        printf("num of ctrls present: %u\n", num);

diff --git a/nvme-print.c b/nvme-print.c
index 64ed64559d694d39aa850f89cd39434ec205ac4c..55a2ab850a7dd5757f2e2bd406af6d38a97534cb 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -545,9 +545,7 @@ void nvme_show_zns_report_zones(void *report, __u32 descs,
 void nvme_show_list_ctrl(struct nvme_ctrl_list *ctrl_list,
        enum nvme_print_flags flags)
 {
-       __u16 num = le16_to_cpu(ctrl_list->num);
-
-       nvme_print(ctrl_list, flags, ctrl_list, num);
+       nvme_print(ctrl_list, flags, ctrl_list);
 }
 
 void nvme_show_id_nvmset(struct nvme_id_nvmset_list *nvmset, unsigned nvmset_id,

diff --git a/nvme-print.h b/nvme-print.h
index 018dad28ca8e1ec98de0fbc8393e44c6511eb288..638a2b6f9e15d48174831cfb052a6a4ca3f9bb6c 100644 (file)
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -23,7 +23,7 @@ struct print_ops {
        /* libnvme types.h print functions */
        void (*ana_log)(struct nvme_ana_log *ana_log, const char *devname, size_t len);
        void (*boot_part_log)(void *bp_log, const char *devname, __u32 size);
-       void (*ctrl_list)(struct nvme_ctrl_list *ctrl_list, __u16 num);
+       void (*ctrl_list)(struct nvme_ctrl_list *ctrl_list);
        void (*ctrl_registers)(void *bar, bool fabrics);
        void (*directive)(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __u32 result, void *buf, __u32 len);
        void (*discovery_log)(struct nvmf_discovery_log *log, int numrec);