From: Jacob Keller Date: Thu, 18 Aug 2022 21:15:20 +0000 (-0700) Subject: devlink: use dl_no_arg instead of checking dl_argc == 0 X-Git-Tag: v6.1.0~33^2~23^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce6ae80c38036b49caf098bd16c0413caff6a17;p=thirdparty%2Fiproute2.git devlink: use dl_no_arg instead of checking dl_argc == 0 Use the helper dl_no_arg function to check for whether the command has any arguments. Signed-off-by: Jacob Keller Reviewed-by: Jiri Pirko Signed-off-by: David Ahern --- diff --git a/devlink/devlink.c b/devlink/devlink.c index 1ccb669c4..aa4fdcff1 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -3358,7 +3358,7 @@ static int cmd_dev_param_show(struct dl *dl) struct nlmsghdr *nlh; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PARAM_GET, flags); @@ -3514,7 +3514,7 @@ static int cmd_dev_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_GET, flags); @@ -3734,7 +3734,7 @@ static int cmd_dev_info(struct dl *dl) return 0; } - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_INFO_GET, flags); @@ -4537,7 +4537,7 @@ static int cmd_port_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PORT_GET, flags); @@ -4605,7 +4605,7 @@ static int cmd_port_param_show(struct dl *dl) struct nlmsghdr *nlh; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_PORT_PARAM_GET, @@ -4959,7 +4959,7 @@ static int cmd_port_fn_rate_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_RATE_GET, flags); @@ -5326,7 +5326,7 @@ static int cmd_linecard_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_LINECARD_GET, @@ -5441,7 +5441,7 @@ static int cmd_sb_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_SB_GET, flags); @@ -5518,7 +5518,7 @@ static int cmd_sb_pool_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_SB_POOL_GET, flags); @@ -5603,7 +5603,7 @@ static int cmd_sb_port_pool_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_SB_PORT_POOL_GET, flags); @@ -5707,7 +5707,7 @@ static int cmd_sb_tc_bind_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_GET, flags); @@ -8377,7 +8377,7 @@ static int cmd_region_show(struct dl *dl) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_REGION_GET, flags); @@ -9047,7 +9047,7 @@ static int __cmd_health_show(struct dl *dl, bool show_device, bool show_port) uint16_t flags = NLM_F_REQUEST | NLM_F_ACK; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_GET, flags); @@ -9239,7 +9239,7 @@ static int cmd_trap_show(struct dl *dl) struct nlmsghdr *nlh; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_TRAP_GET, flags); @@ -9314,7 +9314,7 @@ static int cmd_trap_group_show(struct dl *dl) struct nlmsghdr *nlh; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_TRAP_GROUP_GET, flags); @@ -9411,7 +9411,7 @@ static int cmd_trap_policer_show(struct dl *dl) struct nlmsghdr *nlh; int err; - if (dl_argc(dl) == 0) + if (dl_no_arg(dl)) flags |= NLM_F_DUMP; nlh = mnlu_gen_socket_cmd_prepare(&dl->nlg, DEVLINK_CMD_TRAP_POLICER_GET, flags);