Message ID | 20230131090613.2131740-3-jiri@resnulli.us (mailing list archive) |
---|---|
State | Accepted |
Commit | f87445953d4c1cbcaa110f95dfd64193756f7353 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | devlink: trivial names cleanup | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Clearly marked for net-next |
netdev/fixes_present | success | Fixes tag not required for -next series |
netdev/subject_prefix | success | Link |
netdev/cover_letter | success | Series has a cover letter |
netdev/patch_count | success | Link |
netdev/header_inline | success | No static functions without inline keyword in header files |
netdev/build_32bit | success | Errors and warnings before: 2 this patch: 2 |
netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
netdev/build_clang | success | Errors and warnings before: 1 this patch: 1 |
netdev/module_param | success | Was 0 now: 0 |
netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
netdev/check_selftest | success | No net selftest shell script |
netdev/verify_fixes | success | No Fixes tag |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 2 this patch: 2 |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 198 lines checked |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/source_inline | success | Was 0 now: 0 |
On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote: > From: Jiri Pirko <jiri@nvidia.com> > > No need to have "gen" inside name of the structure for devlink commands. > Remove it. And what about devl_gen_* names? Should they be renamed too? Thanks > > Signed-off-by: Jiri Pirko <jiri@nvidia.com> > --- > net/devlink/devl_internal.h | 36 ++++++++++++++++++------------------ > net/devlink/leftover.c | 32 ++++++++++++++++---------------- > net/devlink/netlink.c | 4 ++-- > 3 files changed, 36 insertions(+), 36 deletions(-) > > diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h > index dd4366c68b96..3910db5547fe 100644 > --- a/net/devlink/devl_internal.h > +++ b/net/devlink/devl_internal.h > @@ -115,7 +115,7 @@ struct devlink_nl_dump_state { > }; > }; > > -struct devlink_gen_cmd { > +struct devlink_cmd { > int (*dump_one)(struct sk_buff *msg, struct devlink *devlink, > struct netlink_callback *cb); > }; > @@ -139,22 +139,22 @@ devlink_dump_state(struct netlink_callback *cb) > return (struct devlink_nl_dump_state *)cb->ctx; > } > > -/* gen cmds */ > -extern const struct devlink_gen_cmd devl_gen_inst; > -extern const struct devlink_gen_cmd devl_gen_port; > -extern const struct devlink_gen_cmd devl_gen_sb; > -extern const struct devlink_gen_cmd devl_gen_sb_pool; > -extern const struct devlink_gen_cmd devl_gen_sb_port_pool; > -extern const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind; > -extern const struct devlink_gen_cmd devl_gen_selftests; > -extern const struct devlink_gen_cmd devl_gen_param; > -extern const struct devlink_gen_cmd devl_gen_region; > -extern const struct devlink_gen_cmd devl_gen_info; > -extern const struct devlink_gen_cmd devl_gen_health_reporter; > -extern const struct devlink_gen_cmd devl_gen_trap; > -extern const struct devlink_gen_cmd devl_gen_trap_group; > -extern const struct devlink_gen_cmd devl_gen_trap_policer; > -extern const struct devlink_gen_cmd devl_gen_linecard; > +/* Commands */ > +extern const struct devlink_cmd devl_gen_inst; > +extern const struct devlink_cmd devl_gen_port; > +extern const struct devlink_cmd devl_gen_sb; > +extern const struct devlink_cmd devl_gen_sb_pool; > +extern const struct devlink_cmd devl_gen_sb_port_pool; > +extern const struct devlink_cmd devl_gen_sb_tc_pool_bind; > +extern const struct devlink_cmd devl_gen_selftests; > +extern const struct devlink_cmd devl_gen_param; > +extern const struct devlink_cmd devl_gen_region; > +extern const struct devlink_cmd devl_gen_info; > +extern const struct devlink_cmd devl_gen_health_reporter; > +extern const struct devlink_cmd devl_gen_trap; > +extern const struct devlink_cmd devl_gen_trap_group; > +extern const struct devlink_cmd devl_gen_trap_policer; > +extern const struct devlink_cmd devl_gen_linecard; > > /* Ports */ > int devlink_port_netdevice_event(struct notifier_block *nb, > @@ -182,7 +182,7 @@ struct devlink_linecard * > devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info); > > /* Rates */ > -extern const struct devlink_gen_cmd devl_gen_rate_get; > +extern const struct devlink_cmd devl_gen_rate_get; > > struct devlink_rate * > devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info); > diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c > index 1461eec423ff..16cb5975de1a 100644 > --- a/net/devlink/leftover.c > +++ b/net/devlink/leftover.c > @@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_rate_get = { > +const struct devlink_cmd devl_gen_rate_get = { > .dump_one = devlink_nl_cmd_rate_get_dump_one, > }; > > @@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > cb->nlh->nlmsg_seq, NLM_F_MULTI); > } > > -const struct devlink_gen_cmd devl_gen_inst = { > +const struct devlink_cmd devl_gen_inst = { > .dump_one = devlink_nl_cmd_get_dump_one, > }; > > @@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_port = { > +const struct devlink_cmd devl_gen_port = { > .dump_one = devlink_nl_cmd_port_get_dump_one, > }; > > @@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_linecard = { > +const struct devlink_cmd devl_gen_linecard = { > .dump_one = devlink_nl_cmd_linecard_get_dump_one, > }; > > @@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_sb = { > +const struct devlink_cmd devl_gen_sb = { > .dump_one = devlink_nl_cmd_sb_get_dump_one, > }; > > @@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_sb_pool = { > +const struct devlink_cmd devl_gen_sb_pool = { > .dump_one = devlink_nl_cmd_sb_pool_get_dump_one, > }; > > @@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_sb_port_pool = { > +const struct devlink_cmd devl_gen_sb_port_pool = { > .dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one, > }; > > @@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind = { > +const struct devlink_cmd devl_gen_sb_tc_pool_bind = { > .dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one, > }; > > @@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg, > cb->extack); > } > > -const struct devlink_gen_cmd devl_gen_selftests = { > +const struct devlink_cmd devl_gen_selftests = { > .dump_one = devlink_nl_cmd_selftests_get_dump_one, > }; > > @@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_param = { > +const struct devlink_cmd devl_gen_param = { > .dump_one = devlink_nl_cmd_param_get_dump_one, > }; > > @@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return 0; > } > > -const struct devlink_gen_cmd devl_gen_region = { > +const struct devlink_cmd devl_gen_region = { > .dump_one = devlink_nl_cmd_region_get_dump_one, > }; > > @@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_info = { > +const struct devlink_cmd devl_gen_info = { > .dump_one = devlink_nl_cmd_info_get_dump_one, > }; > > @@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg, > return 0; > } > > -const struct devlink_gen_cmd devl_gen_health_reporter = { > +const struct devlink_cmd devl_gen_health_reporter = { > .dump_one = devlink_nl_cmd_health_reporter_get_dump_one, > }; > > @@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink, > return err; > } > > -const struct devlink_gen_cmd devl_gen_trap = { > +const struct devlink_cmd devl_gen_trap = { > .dump_one = devlink_nl_cmd_trap_get_dump_one, > }; > > @@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_trap_group = { > +const struct devlink_cmd devl_gen_trap_group = { > .dump_one = devlink_nl_cmd_trap_group_get_dump_one, > }; > > @@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg, > return err; > } > > -const struct devlink_gen_cmd devl_gen_trap_policer = { > +const struct devlink_cmd devl_gen_trap_policer = { > .dump_one = devlink_nl_cmd_trap_policer_get_dump_one, > }; > > diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c > index 11666edf5cd2..33ed3984f3cb 100644 > --- a/net/devlink/netlink.c > +++ b/net/devlink/netlink.c > @@ -177,7 +177,7 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops, > devlink_put(devlink); > } > > -static const struct devlink_gen_cmd *devl_gen_cmds[] = { > +static const struct devlink_cmd *devl_gen_cmds[] = { > [DEVLINK_CMD_GET] = &devl_gen_inst, > [DEVLINK_CMD_PORT_GET] = &devl_gen_port, > [DEVLINK_CMD_SB_GET] = &devl_gen_sb, > @@ -201,7 +201,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg, > { > const struct genl_dumpit_info *info = genl_dumpit_info(cb); > struct devlink_nl_dump_state *state = devlink_dump_state(cb); > - const struct devlink_gen_cmd *cmd; > + const struct devlink_cmd *cmd; > struct devlink *devlink; > int err = 0; > > -- > 2.39.0 >
Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote: >On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote: >> From: Jiri Pirko <jiri@nvidia.com> >> >> No need to have "gen" inside name of the structure for devlink commands. >> Remove it. > >And what about devl_gen_* names? Should they be renamed too? Yep, see the next patch :)
On Tue, Jan 31, 2023 at 12:54:20PM +0100, Jiri Pirko wrote: > Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote: > >On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote: > >> From: Jiri Pirko <jiri@nvidia.com> > >> > >> No need to have "gen" inside name of the structure for devlink commands. > >> Remove it. > > > >And what about devl_gen_* names? Should they be renamed too? > > Yep, see the next patch :) Ohh, I would organize them differently. Thanks
Tue, Jan 31, 2023 at 12:57:56PM CET, leon@kernel.org wrote: >On Tue, Jan 31, 2023 at 12:54:20PM +0100, Jiri Pirko wrote: >> Tue, Jan 31, 2023 at 12:51:47PM CET, leon@kernel.org wrote: >> >On Tue, Jan 31, 2023 at 10:06:12AM +0100, Jiri Pirko wrote: >> >> From: Jiri Pirko <jiri@nvidia.com> >> >> >> >> No need to have "gen" inside name of the structure for devlink commands. >> >> Remove it. >> > >> >And what about devl_gen_* names? Should they be renamed too? >> >> Yep, see the next patch :) > >Ohh, I would organize them differently. I wanted to rename the variable names once. That's why I have it in the next patch. > >Thanks
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index dd4366c68b96..3910db5547fe 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -115,7 +115,7 @@ struct devlink_nl_dump_state { }; }; -struct devlink_gen_cmd { +struct devlink_cmd { int (*dump_one)(struct sk_buff *msg, struct devlink *devlink, struct netlink_callback *cb); }; @@ -139,22 +139,22 @@ devlink_dump_state(struct netlink_callback *cb) return (struct devlink_nl_dump_state *)cb->ctx; } -/* gen cmds */ -extern const struct devlink_gen_cmd devl_gen_inst; -extern const struct devlink_gen_cmd devl_gen_port; -extern const struct devlink_gen_cmd devl_gen_sb; -extern const struct devlink_gen_cmd devl_gen_sb_pool; -extern const struct devlink_gen_cmd devl_gen_sb_port_pool; -extern const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind; -extern const struct devlink_gen_cmd devl_gen_selftests; -extern const struct devlink_gen_cmd devl_gen_param; -extern const struct devlink_gen_cmd devl_gen_region; -extern const struct devlink_gen_cmd devl_gen_info; -extern const struct devlink_gen_cmd devl_gen_health_reporter; -extern const struct devlink_gen_cmd devl_gen_trap; -extern const struct devlink_gen_cmd devl_gen_trap_group; -extern const struct devlink_gen_cmd devl_gen_trap_policer; -extern const struct devlink_gen_cmd devl_gen_linecard; +/* Commands */ +extern const struct devlink_cmd devl_gen_inst; +extern const struct devlink_cmd devl_gen_port; +extern const struct devlink_cmd devl_gen_sb; +extern const struct devlink_cmd devl_gen_sb_pool; +extern const struct devlink_cmd devl_gen_sb_port_pool; +extern const struct devlink_cmd devl_gen_sb_tc_pool_bind; +extern const struct devlink_cmd devl_gen_selftests; +extern const struct devlink_cmd devl_gen_param; +extern const struct devlink_cmd devl_gen_region; +extern const struct devlink_cmd devl_gen_info; +extern const struct devlink_cmd devl_gen_health_reporter; +extern const struct devlink_cmd devl_gen_trap; +extern const struct devlink_cmd devl_gen_trap_group; +extern const struct devlink_cmd devl_gen_trap_policer; +extern const struct devlink_cmd devl_gen_linecard; /* Ports */ int devlink_port_netdevice_event(struct notifier_block *nb, @@ -182,7 +182,7 @@ struct devlink_linecard * devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info); /* Rates */ -extern const struct devlink_gen_cmd devl_gen_rate_get; +extern const struct devlink_cmd devl_gen_rate_get; struct devlink_rate * devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info); diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c index 1461eec423ff..16cb5975de1a 100644 --- a/net/devlink/leftover.c +++ b/net/devlink/leftover.c @@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_rate_get = { +const struct devlink_cmd devl_gen_rate_get = { .dump_one = devlink_nl_cmd_rate_get_dump_one, }; @@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink, cb->nlh->nlmsg_seq, NLM_F_MULTI); } -const struct devlink_gen_cmd devl_gen_inst = { +const struct devlink_cmd devl_gen_inst = { .dump_one = devlink_nl_cmd_get_dump_one, }; @@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_port = { +const struct devlink_cmd devl_gen_port = { .dump_one = devlink_nl_cmd_port_get_dump_one, }; @@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_linecard = { +const struct devlink_cmd devl_gen_linecard = { .dump_one = devlink_nl_cmd_linecard_get_dump_one, }; @@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_sb = { +const struct devlink_cmd devl_gen_sb = { .dump_one = devlink_nl_cmd_sb_get_dump_one, }; @@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_sb_pool = { +const struct devlink_cmd devl_gen_sb_pool = { .dump_one = devlink_nl_cmd_sb_pool_get_dump_one, }; @@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_sb_port_pool = { +const struct devlink_cmd devl_gen_sb_port_pool = { .dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one, }; @@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind = { +const struct devlink_cmd devl_gen_sb_tc_pool_bind = { .dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one, }; @@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg, cb->extack); } -const struct devlink_gen_cmd devl_gen_selftests = { +const struct devlink_cmd devl_gen_selftests = { .dump_one = devlink_nl_cmd_selftests_get_dump_one, }; @@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_param = { +const struct devlink_cmd devl_gen_param = { .dump_one = devlink_nl_cmd_param_get_dump_one, }; @@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return 0; } -const struct devlink_gen_cmd devl_gen_region = { +const struct devlink_cmd devl_gen_region = { .dump_one = devlink_nl_cmd_region_get_dump_one, }; @@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_info = { +const struct devlink_cmd devl_gen_info = { .dump_one = devlink_nl_cmd_info_get_dump_one, }; @@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg, return 0; } -const struct devlink_gen_cmd devl_gen_health_reporter = { +const struct devlink_cmd devl_gen_health_reporter = { .dump_one = devlink_nl_cmd_health_reporter_get_dump_one, }; @@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink, return err; } -const struct devlink_gen_cmd devl_gen_trap = { +const struct devlink_cmd devl_gen_trap = { .dump_one = devlink_nl_cmd_trap_get_dump_one, }; @@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_trap_group = { +const struct devlink_cmd devl_gen_trap_group = { .dump_one = devlink_nl_cmd_trap_group_get_dump_one, }; @@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg, return err; } -const struct devlink_gen_cmd devl_gen_trap_policer = { +const struct devlink_cmd devl_gen_trap_policer = { .dump_one = devlink_nl_cmd_trap_policer_get_dump_one, }; diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c index 11666edf5cd2..33ed3984f3cb 100644 --- a/net/devlink/netlink.c +++ b/net/devlink/netlink.c @@ -177,7 +177,7 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops, devlink_put(devlink); } -static const struct devlink_gen_cmd *devl_gen_cmds[] = { +static const struct devlink_cmd *devl_gen_cmds[] = { [DEVLINK_CMD_GET] = &devl_gen_inst, [DEVLINK_CMD_PORT_GET] = &devl_gen_port, [DEVLINK_CMD_SB_GET] = &devl_gen_sb, @@ -201,7 +201,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg, { const struct genl_dumpit_info *info = genl_dumpit_info(cb); struct devlink_nl_dump_state *state = devlink_dump_state(cb); - const struct devlink_gen_cmd *cmd; + const struct devlink_cmd *cmd; struct devlink *devlink; int err = 0;