Skip to content

Commit f874459

Browse files
Jiri Pirkokuba-moo
authored andcommitted
devlink: remove "gen" from struct devlink_gen_cmd name
No need to have "gen" inside name of the structure for devlink commands. Remove it. Signed-off-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent c3a4fd5 commit f874459

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

net/devlink/devl_internal.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct devlink_nl_dump_state {
115115
};
116116
};
117117

118-
struct devlink_gen_cmd {
118+
struct devlink_cmd {
119119
int (*dump_one)(struct sk_buff *msg, struct devlink *devlink,
120120
struct netlink_callback *cb);
121121
};
@@ -139,22 +139,22 @@ devlink_dump_state(struct netlink_callback *cb)
139139
return (struct devlink_nl_dump_state *)cb->ctx;
140140
}
141141

142-
/* gen cmds */
143-
extern const struct devlink_gen_cmd devl_gen_inst;
144-
extern const struct devlink_gen_cmd devl_gen_port;
145-
extern const struct devlink_gen_cmd devl_gen_sb;
146-
extern const struct devlink_gen_cmd devl_gen_sb_pool;
147-
extern const struct devlink_gen_cmd devl_gen_sb_port_pool;
148-
extern const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind;
149-
extern const struct devlink_gen_cmd devl_gen_selftests;
150-
extern const struct devlink_gen_cmd devl_gen_param;
151-
extern const struct devlink_gen_cmd devl_gen_region;
152-
extern const struct devlink_gen_cmd devl_gen_info;
153-
extern const struct devlink_gen_cmd devl_gen_health_reporter;
154-
extern const struct devlink_gen_cmd devl_gen_trap;
155-
extern const struct devlink_gen_cmd devl_gen_trap_group;
156-
extern const struct devlink_gen_cmd devl_gen_trap_policer;
157-
extern const struct devlink_gen_cmd devl_gen_linecard;
142+
/* Commands */
143+
extern const struct devlink_cmd devl_gen_inst;
144+
extern const struct devlink_cmd devl_gen_port;
145+
extern const struct devlink_cmd devl_gen_sb;
146+
extern const struct devlink_cmd devl_gen_sb_pool;
147+
extern const struct devlink_cmd devl_gen_sb_port_pool;
148+
extern const struct devlink_cmd devl_gen_sb_tc_pool_bind;
149+
extern const struct devlink_cmd devl_gen_selftests;
150+
extern const struct devlink_cmd devl_gen_param;
151+
extern const struct devlink_cmd devl_gen_region;
152+
extern const struct devlink_cmd devl_gen_info;
153+
extern const struct devlink_cmd devl_gen_health_reporter;
154+
extern const struct devlink_cmd devl_gen_trap;
155+
extern const struct devlink_cmd devl_gen_trap_group;
156+
extern const struct devlink_cmd devl_gen_trap_policer;
157+
extern const struct devlink_cmd devl_gen_linecard;
158158

159159
/* Ports */
160160
int devlink_port_netdevice_event(struct notifier_block *nb,
@@ -182,7 +182,7 @@ struct devlink_linecard *
182182
devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info);
183183

184184
/* Rates */
185-
extern const struct devlink_gen_cmd devl_gen_rate_get;
185+
extern const struct devlink_cmd devl_gen_rate_get;
186186

187187
struct devlink_rate *
188188
devlink_rate_get_from_info(struct devlink *devlink, struct genl_info *info);

net/devlink/leftover.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ devlink_nl_cmd_rate_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
12361236
return err;
12371237
}
12381238

1239-
const struct devlink_gen_cmd devl_gen_rate_get = {
1239+
const struct devlink_cmd devl_gen_rate_get = {
12401240
.dump_one = devlink_nl_cmd_rate_get_dump_one,
12411241
};
12421242

@@ -1303,7 +1303,7 @@ devlink_nl_cmd_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
13031303
cb->nlh->nlmsg_seq, NLM_F_MULTI);
13041304
}
13051305

1306-
const struct devlink_gen_cmd devl_gen_inst = {
1306+
const struct devlink_cmd devl_gen_inst = {
13071307
.dump_one = devlink_nl_cmd_get_dump_one,
13081308
};
13091309

@@ -1359,7 +1359,7 @@ devlink_nl_cmd_port_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
13591359
return err;
13601360
}
13611361

1362-
const struct devlink_gen_cmd devl_gen_port = {
1362+
const struct devlink_cmd devl_gen_port = {
13631363
.dump_one = devlink_nl_cmd_port_get_dump_one,
13641364
};
13651365

@@ -2137,7 +2137,7 @@ static int devlink_nl_cmd_linecard_get_dump_one(struct sk_buff *msg,
21372137
return err;
21382138
}
21392139

2140-
const struct devlink_gen_cmd devl_gen_linecard = {
2140+
const struct devlink_cmd devl_gen_linecard = {
21412141
.dump_one = devlink_nl_cmd_linecard_get_dump_one,
21422142
};
21432143

@@ -2392,7 +2392,7 @@ devlink_nl_cmd_sb_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
23922392
return err;
23932393
}
23942394

2395-
const struct devlink_gen_cmd devl_gen_sb = {
2395+
const struct devlink_cmd devl_gen_sb = {
23962396
.dump_one = devlink_nl_cmd_sb_get_dump_one,
23972397
};
23982398

@@ -2530,7 +2530,7 @@ devlink_nl_cmd_sb_pool_get_dump_one(struct sk_buff *msg,
25302530
return err;
25312531
}
25322532

2533-
const struct devlink_gen_cmd devl_gen_sb_pool = {
2533+
const struct devlink_cmd devl_gen_sb_pool = {
25342534
.dump_one = devlink_nl_cmd_sb_pool_get_dump_one,
25352535
};
25362536

@@ -2738,7 +2738,7 @@ devlink_nl_cmd_sb_port_pool_get_dump_one(struct sk_buff *msg,
27382738
return err;
27392739
}
27402740

2741-
const struct devlink_gen_cmd devl_gen_sb_port_pool = {
2741+
const struct devlink_cmd devl_gen_sb_port_pool = {
27422742
.dump_one = devlink_nl_cmd_sb_port_pool_get_dump_one,
27432743
};
27442744

@@ -2973,7 +2973,7 @@ devlink_nl_cmd_sb_tc_pool_bind_get_dump_one(struct sk_buff *msg,
29732973
return err;
29742974
}
29752975

2976-
const struct devlink_gen_cmd devl_gen_sb_tc_pool_bind = {
2976+
const struct devlink_cmd devl_gen_sb_tc_pool_bind = {
29772977
.dump_one = devlink_nl_cmd_sb_tc_pool_bind_get_dump_one,
29782978
};
29792979

@@ -4785,7 +4785,7 @@ devlink_nl_cmd_selftests_get_dump_one(struct sk_buff *msg,
47854785
cb->extack);
47864786
}
47874787

4788-
const struct devlink_gen_cmd devl_gen_selftests = {
4788+
const struct devlink_cmd devl_gen_selftests = {
47894789
.dump_one = devlink_nl_cmd_selftests_get_dump_one,
47904790
};
47914791

@@ -5271,7 +5271,7 @@ devlink_nl_cmd_param_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
52715271
return err;
52725272
}
52735273

5274-
const struct devlink_gen_cmd devl_gen_param = {
5274+
const struct devlink_cmd devl_gen_param = {
52755275
.dump_one = devlink_nl_cmd_param_get_dump_one,
52765276
};
52775277

@@ -5978,7 +5978,7 @@ devlink_nl_cmd_region_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
59785978
return 0;
59795979
}
59805980

5981-
const struct devlink_gen_cmd devl_gen_region = {
5981+
const struct devlink_cmd devl_gen_region = {
59825982
.dump_one = devlink_nl_cmd_region_get_dump_one,
59835983
};
59845984

@@ -6625,7 +6625,7 @@ devlink_nl_cmd_info_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
66256625
return err;
66266626
}
66276627

6628-
const struct devlink_gen_cmd devl_gen_info = {
6628+
const struct devlink_cmd devl_gen_info = {
66296629
.dump_one = devlink_nl_cmd_info_get_dump_one,
66306630
};
66316631

@@ -7793,7 +7793,7 @@ devlink_nl_cmd_health_reporter_get_dump_one(struct sk_buff *msg,
77937793
return 0;
77947794
}
77957795

7796-
const struct devlink_gen_cmd devl_gen_health_reporter = {
7796+
const struct devlink_cmd devl_gen_health_reporter = {
77977797
.dump_one = devlink_nl_cmd_health_reporter_get_dump_one,
77987798
};
77997799

@@ -8311,7 +8311,7 @@ devlink_nl_cmd_trap_get_dump_one(struct sk_buff *msg, struct devlink *devlink,
83118311
return err;
83128312
}
83138313

8314-
const struct devlink_gen_cmd devl_gen_trap = {
8314+
const struct devlink_cmd devl_gen_trap = {
83158315
.dump_one = devlink_nl_cmd_trap_get_dump_one,
83168316
};
83178317

@@ -8524,7 +8524,7 @@ devlink_nl_cmd_trap_group_get_dump_one(struct sk_buff *msg,
85248524
return err;
85258525
}
85268526

8527-
const struct devlink_gen_cmd devl_gen_trap_group = {
8527+
const struct devlink_cmd devl_gen_trap_group = {
85288528
.dump_one = devlink_nl_cmd_trap_group_get_dump_one,
85298529
};
85308530

@@ -8817,7 +8817,7 @@ devlink_nl_cmd_trap_policer_get_dump_one(struct sk_buff *msg,
88178817
return err;
88188818
}
88198819

8820-
const struct devlink_gen_cmd devl_gen_trap_policer = {
8820+
const struct devlink_cmd devl_gen_trap_policer = {
88218821
.dump_one = devlink_nl_cmd_trap_policer_get_dump_one,
88228822
};
88238823

net/devlink/netlink.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static void devlink_nl_post_doit(const struct genl_split_ops *ops,
177177
devlink_put(devlink);
178178
}
179179

180-
static const struct devlink_gen_cmd *devl_gen_cmds[] = {
180+
static const struct devlink_cmd *devl_gen_cmds[] = {
181181
[DEVLINK_CMD_GET] = &devl_gen_inst,
182182
[DEVLINK_CMD_PORT_GET] = &devl_gen_port,
183183
[DEVLINK_CMD_SB_GET] = &devl_gen_sb,
@@ -201,7 +201,7 @@ int devlink_nl_instance_iter_dumpit(struct sk_buff *msg,
201201
{
202202
const struct genl_dumpit_info *info = genl_dumpit_info(cb);
203203
struct devlink_nl_dump_state *state = devlink_dump_state(cb);
204-
const struct devlink_gen_cmd *cmd;
204+
const struct devlink_cmd *cmd;
205205
struct devlink *devlink;
206206
int err = 0;
207207

0 commit comments

Comments
 (0)