]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
devlink: remove "dev" object sub help messages
authorJiri Pirko <jiri@mellanox.com>
Sat, 4 Apr 2020 16:16:20 +0000 (18:16 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 6 Apr 2020 17:00:32 +0000 (10:00 -0700)
Remove duplicate sub help messages for "dev" object and have them all
show help message for "dev".

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
devlink/devlink.c

index 2df7ad472b37924434fd99032080a1b4a53e554e..51be0efabd05f5dbd815c91c953e99fe21222a41 100644 (file)
@@ -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;
        }