From 8daa76a52dfd9dac4be87a37269c225c15977bdd Mon Sep 17 00:00:00 2001 From: Zheng Yongjun Date: Tue, 8 Dec 2020 20:10:46 +0800 Subject: [PATCH] net: core: devlink: simplify the return expression of devlink_nl_cmd_trap_set_doit() Simplify the return expression. Signed-off-by: Zheng Yongjun Signed-off-by: David S. Miller --- 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 88c0ac8ed444..ee828e4b1007 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6993,7 +6993,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; @@ -7004,11 +7003,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 *