From: muhammad.ahmad@seagate.com Date: Thu, 7 Jun 2018 22:06:27 +0000 (-0500) Subject: Removed Duplicate commands. X-Git-Tag: v1.6~30^2~3 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6db013ef96a9dc1bac8bdaf8e11b788e86d563a3;p=users%2Fsagi%2Fnvme-cli.git Removed Duplicate commands. --- diff --git a/seagate-nvme.c b/seagate-nvme.c index 4ced91e0..8cf8a3ef 100755 --- a/seagate-nvme.c +++ b/seagate-nvme.c @@ -826,11 +826,6 @@ static int vs_smart_log(int argc, char **argv, struct command *cmd, struct plugi } //EOF Extended-SMART Information -static int vs_smart_log_wrapper(int argc, char **argv, struct command *cmd, struct plugin *plugin) -{ - return vs_smart_log(argc, argv, cmd, plugin); -} - /*************************************** * Temperature-Stats information ***************************************/ @@ -956,12 +951,6 @@ static int temp_stats(int argc, char **argv, struct command *cmd, struct plugin } //EOF Temperature Stats information -static int temp_stats_wrapper(int argc, char **argv, struct command *cmd, struct plugin *plugin) -{ - return temp_stats(argc, argv, cmd, plugin); -} - - /*************************************** * PCIe error-log information ***************************************/ @@ -1122,11 +1111,6 @@ static int vs_clr_pcie_correctable_errs(int argc, char **argv, struct command *c } -static int vs_clr_pcie_correctable_errs_wrapper(int argc, char **argv, struct command *cmd, struct plugin *plugin) -{ - return vs_clr_pcie_correctable_errs(argc, argv, cmd, plugin); -} - int nvme_get_log_with_offset(int fd, __u32 nsid, __u16 log_id, __u32 data_len, __u64 offset, void *data) { struct nvme_admin_cmd cmd = { diff --git a/seagate-nvme.h b/seagate-nvme.h index 78c9f58b..bcf19d31 100755 --- a/seagate-nvme.h +++ b/seagate-nvme.h @@ -28,14 +28,11 @@ PLUGIN(NAME("seagate", "Seagate vendor specific extensions"), COMMAND_LIST( - ENTRY("vs-temp-stats", "Retrieve Seagate temperature statistics ", temp_stats) - ENTRY("vs-temperature-stats", "Retrieve Seagate temperature statistics ", temp_stats_wrapper) + ENTRY("vs-temperature-stats", "Retrieve Seagate temperature statistics ", temp_stats) ENTRY("vs-log-page-sup", "Retrieve Seagate Supported Log-pages Information ", log_pages_supp) - ENTRY("vs-smart-log", "Retrieve Seagate extended-SMART Information ", vs_smart_log) - ENTRY("vs-smart-add-log", "Retrieve Seagate extended-SMART Information ", vs_smart_log_wrapper) + ENTRY("vs-smart-add-log", "Retrieve Seagate extended-SMART Information ", vs_smart_log) ENTRY("vs-pcie-stats", "Retrieve Seagate PCIe error statistics ", vs_pcie_error_log) - ENTRY("clr-pcie-errs", "Clear Seagate PCIe error statistics ", vs_clr_pcie_correctable_errs) - ENTRY("clear-pcie-correctable-errors", "Clear Seagate PCIe error statistics ", vs_clr_pcie_correctable_errs_wrapper) + ENTRY("clear-pcie-correctable-errors", "Clear Seagate PCIe error statistics ", vs_clr_pcie_correctable_errs) ENTRY("get-host-tele", "Retrieve Seagate Host-Initiated Telemetry ", get_host_tele) ENTRY("get-ctrl-tele", "Retrieve Seagate Controller-Initiated Telemetry ", get_ctrl_tele) ENTRY("vs-internal-log", "Retrieve Seagate Controller-Initiated Telemetry in binary format", vs_internal_log)