Skip to content

Commit 337ad36

Browse files
Jiri PirkoPaolo Abeni
authored andcommitted
devlink: use devl_is_registered() helper instead xa_get_mark()
Instead of checking the xarray mark directly using xa_get_mark() helper use devl_is_registered() helper which wraps it up. Note that there are couple more users of xa_get_mark() left which are going to be handled by the next patch. Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent f7dd48e commit 337ad36

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

net/devlink/dev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
202202
int err;
203203

204204
WARN_ON(cmd != DEVLINK_CMD_NEW && cmd != DEVLINK_CMD_DEL);
205-
WARN_ON(!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED));
205+
WARN_ON(!devl_is_registered(devlink));
206206

207207
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
208208
if (!msg)
@@ -999,7 +999,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
999999
cmd != DEVLINK_CMD_FLASH_UPDATE_END &&
10001000
cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);
10011001

1002-
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
1002+
if (!devl_is_registered(devlink))
10031003
return;
10041004

10051005
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

net/devlink/rate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
146146

147147
WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);
148148

149-
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
149+
if (!devl_is_registered(devlink))
150150
return;
151151

152152
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

net/devlink/trap.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,8 @@ devlink_trap_group_notify(struct devlink *devlink,
11731173

11741174
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&
11751175
cmd != DEVLINK_CMD_TRAP_GROUP_DEL);
1176-
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
1176+
1177+
if (!devl_is_registered(devlink))
11771178
return;
11781179

11791180
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1234,7 +1235,8 @@ static void devlink_trap_notify(struct devlink *devlink,
12341235

12351236
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &&
12361237
cmd != DEVLINK_CMD_TRAP_DEL);
1237-
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
1238+
1239+
if (!devl_is_registered(devlink))
12381240
return;
12391241

12401242
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1710,7 +1712,8 @@ devlink_trap_policer_notify(struct devlink *devlink,
17101712

17111713
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&
17121714
cmd != DEVLINK_CMD_TRAP_POLICER_DEL);
1713-
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
1715+
1716+
if (!devl_is_registered(devlink))
17141717
return;
17151718

17161719
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

0 commit comments

Comments
 (0)