From 885f4b0d7ad6edcb2c99034abe69c916973185f9 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Sat, 4 Apr 2020 18:16:20 +0200 Subject: [PATCH] devlink: remove "dev" object sub help messages Remove duplicate sub help messages for "dev" object and have them all show help message for "dev". Signed-off-by: Jiri Pirko Signed-off-by: Stephen Hemminger --- devlink/devlink.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 2df7ad472..51be0efab 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -2765,18 +2765,13 @@ static int cmd_dev_show(struct dl *dl) return err; } -static void cmd_dev_reload_help(void) -{ - pr_err("Usage: devlink dev reload DEV [ netns { PID | NAME | ID } ]\n"); -} - static int cmd_dev_reload(struct dl *dl) { struct nlmsghdr *nlh; int err; if (dl_argv_match(dl, "help") || dl_no_arg(dl)) { - cmd_dev_reload_help(); + cmd_dev_help(); return 0; } @@ -2898,11 +2893,6 @@ static int cmd_versions_show_cb(const struct nlmsghdr *nlh, void *data) return MNL_CB_OK; } -static void cmd_dev_info_help(void) -{ - pr_err("Usage: devlink dev info [ DEV ]\n"); -} - static int cmd_dev_info(struct dl *dl) { struct nlmsghdr *nlh; @@ -2910,7 +2900,7 @@ static int cmd_dev_info(struct dl *dl) int err; if (dl_argv_match(dl, "help")) { - cmd_dev_info_help(); + cmd_dev_help(); return 0; } @@ -2931,12 +2921,6 @@ static int cmd_dev_info(struct dl *dl) return err; } -static void cmd_dev_flash_help(void) -{ - pr_err("Usage: devlink dev flash DEV file PATH [ component NAME ]\n"); -} - - struct cmd_dev_flash_status_ctx { struct dl *dl; char *last_msg; @@ -3084,7 +3068,7 @@ static int cmd_dev_flash(struct dl *dl) int err; if (dl_argv_match(dl, "help") || dl_no_arg(dl)) { - cmd_dev_flash_help(); + cmd_dev_help(); return 0; } -- 2.47.2