devlink: remove some unnecessary code

This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice.  Once
at the start of the function and then a couple lines later.  Delete the
second check since that one must be true.

Because the second condition is always true, it means the:

	policer_item = group_item->policer_item;

assignment is immediately over-written.  Delete that as well.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/Y8EJz8oxpMhfiPUb@kili
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 1e23b2da78cc9d4033a4d584e70ca53e7eec9442..bf5e0b1c04222b17cd3e60720ec8e66ded7b0921 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -8719,6 +8719,7 @@ static int devlink_trap_group_set(struct devlink *devlink,
        struct netlink_ext_ack *extack = info->extack;
        const struct devlink_trap_policer *policer;
        struct nlattr **attrs = info->attrs;
+       u32 policer_id;
        int err;
 
        if (!attrs[DEVLINK_ATTR_TRAP_POLICER_ID])
@@ -8727,17 +8728,11 @@ static int devlink_trap_group_set(struct devlink *devlink,
        if (!devlink->ops->trap_group_set)
                return -EOPNOTSUPP;
 
-       policer_item = group_item->policer_item;
-       if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) {
-               u32 policer_id;
-
-               policer_id = nla_get_u32(attrs[DEVLINK_ATTR_TRAP_POLICER_ID]);
-               policer_item = devlink_trap_policer_item_lookup(devlink,
-                                                               policer_id);
-               if (policer_id && !policer_item) {
-                       NL_SET_ERR_MSG_MOD(extack, "Device did not register this trap policer");
-                       return -ENOENT;
-               }
+       policer_id = nla_get_u32(attrs[DEVLINK_ATTR_TRAP_POLICER_ID]);
+       policer_item = devlink_trap_policer_item_lookup(devlink, policer_id);
+       if (policer_id && !policer_item) {
+               NL_SET_ERR_MSG_MOD(extack, "Device did not register this trap policer");
+               return -ENOENT;
        }
        policer = policer_item ? policer_item->policer : NULL;