nvme-print: remove unused nvme_show_id_ctrl function

rename __nvme_show_id_ctrl -> nvme_show_id_ctrl

Signed-off-by: Steven Seungcheol Lee <sc108.lee@samsung.com>

diff --git a/nvme-print.c b/nvme-print.c
index d382969ded8c92f9ce8f82fa91fbc6c450995af2..c1130d5057c967dd7356a685d7d5ecb52bf9f541 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -4206,7 +4206,7 @@ static void nvme_show_id_ctrl_power(struct nvme_id_ctrl *ctrl)
        }
 }
 
-void __nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, enum nvme_print_flags flags,
+void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, enum nvme_print_flags flags,
                        void (*vendor_show)(__u8 *vs, struct json_object *root))
 {
        bool human = flags & VERBOSE, vs = flags & VS;
@@ -4386,11 +4386,6 @@ void __nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, enum nvme_print_flags flags,
        }
 }
 
-void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode)
-{
-       __nvme_show_id_ctrl(ctrl, mode, NULL);
-}
-
 static void json_nvme_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm)
 {
        struct json_object *root;

diff --git a/nvme-print.h b/nvme-print.h
index 5f4f872e5f1534629b5bee0a209d388403087073..297dfd867c0a8fbf646f1d2698231e3b17f1c378 100644 (file)
--- a/nvme-print.h
+++ b/nvme-print.h
@@ -21,9 +21,8 @@ void nvme_show_lba_status_info(__u32 result);
 void nvme_show_relatives(const char *name);
 
 void nvme_show_id_iocs(struct nvme_id_iocs *iocs);
-void __nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode,
+void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode,
        void (*vendor_show)(__u8 *vs, struct json_object *root));
-void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode);
 void nvme_show_id_ns(struct nvme_id_ns *ns, unsigned int nsid,
                unsigned int lba_index, bool cap_only, enum nvme_print_flags flags);
 void nvme_show_cmd_set_independent_id_ns(

diff --git a/nvme.c b/nvme.c
index 60e79c7d3ad5c2f2ddc6fa35b14c63995d37b9ea..e5398c06073ed8ba62d2ecc8cc47191196ebfe1c 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -2595,7 +2595,7 @@ int __id_ctrl(int argc, char **argv, struct command *cmd, struct plugin *plugin,
 
        err = nvme_identify_ctrl(fd, &ctrl);
        if (!err)
-               __nvme_show_id_ctrl(&ctrl, flags, vs);
+               nvme_show_id_ctrl(&ctrl, flags, vs);
        else if (err > 0)
                nvme_show_status(err);
        else