[PATCH net-next] net: core: devlink: simplify the return expression of devlink_nl_cmd_trap_set_doit()

From: Zheng Yongjun
Date: Tue Dec 08 2020 - 07:11:56 EST


Simplify the return expression.

Signed-off-by: Zheng Yongjun <zhengyongjun3@xxxxxxxxxx>
---
net/core/devlink.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 8c5ddffd707d..3f0a65ee0474 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6981,7 +6981,6 @@ static int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb,
struct netlink_ext_ack *extack = info->extack;
struct devlink *devlink = info->user_ptr[0];
struct devlink_trap_item *trap_item;
- int err;

if (list_empty(&devlink->trap_list))
return -EOPNOTSUPP;
@@ -6992,11 +6991,7 @@ static int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb,
return -ENOENT;
}

- err = devlink_trap_action_set(devlink, trap_item, info);
- if (err)
- return err;
-
- return 0;
+ return devlink_trap_action_set(devlink, trap_item, info);
}

static struct devlink_trap_group_item *
--
2.22.0