matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Jiri Pirko 2020-04-04 18:16:20 +02:00 committed by Stephen Hemminger
parent b2522187d8
commit 885f4b0d7a
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devlink/devlink.c
View File

@ -2765,18 +2765,13 @@ static int cmd_dev_show(struct dl *dl)
return err; 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) static int cmd_dev_reload(struct dl *dl)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
int err; int err;
if (dl_argv_match(dl, "help") || dl_no_arg(dl)) { if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
cmd_dev_reload_help(); cmd_dev_help();
return 0; return 0;
} }
@ -2898,11 +2893,6 @@ static int cmd_versions_show_cb(const struct nlmsghdr *nlh, void *data)
return MNL_CB_OK; 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) static int cmd_dev_info(struct dl *dl)
{ {
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
@ -2910,7 +2900,7 @@ static int cmd_dev_info(struct dl *dl)
int err; int err;
if (dl_argv_match(dl, "help")) { if (dl_argv_match(dl, "help")) {
cmd_dev_info_help(); cmd_dev_help();
return 0; return 0;
} }
@ -2931,12 +2921,6 @@ static int cmd_dev_info(struct dl *dl)
return err; 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 cmd_dev_flash_status_ctx {
struct dl *dl; struct dl *dl;
char *last_msg; char *last_msg;
@ -3084,7 +3068,7 @@ static int cmd_dev_flash(struct dl *dl)
int err; int err;
if (dl_argv_match(dl, "help") || dl_no_arg(dl)) { if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
cmd_dev_flash_help(); cmd_dev_help();
return 0; return 0;
} }