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 <jiri@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 918a0395b03ef1e9d96c028420f0220790877a5a..3fe93c8a9fe2aedb19fdcd23316ed7e20e650aee 100644 (file)
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -202,7 +202,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
        int err;
 
        WARN_ON(cmd != DEVLINK_CMD_NEW && cmd != DEVLINK_CMD_DEL);
-       WARN_ON(!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED));
+       WARN_ON(!devl_is_registered(devlink));
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
        if (!msg)
@@ -999,7 +999,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
                cmd != DEVLINK_CMD_FLASH_UPDATE_END &&
                cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);
 
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+       if (!devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 94b289b93ff285128fd834f8c70cceea1fd4e0fa..e2190cf22bebccc597616bd015a8f51cadc50111 100644 (file)
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -146,7 +146,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
 
        WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);
 
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+       if (!devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index c26313e7ca08ba1f7bad9d43db64e355024c6bea..908085e2c990b2eb62d85cc34b9d8cb56febc9cc 100644 (file)
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1173,7 +1173,8 @@ devlink_trap_group_notify(struct devlink *devlink,
 
        WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&
                     cmd != DEVLINK_CMD_TRAP_GROUP_DEL);
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+       if (!devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1234,7 +1235,8 @@ static void devlink_trap_notify(struct devlink *devlink,
 
        WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &&
                     cmd != DEVLINK_CMD_TRAP_DEL);
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+       if (!devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1710,7 +1712,8 @@ devlink_trap_policer_notify(struct devlink *devlink,
 
        WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&
                     cmd != DEVLINK_CMD_TRAP_POLICER_DEL);
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+       if (!devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);