Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Ziyang Xuan <william.xuanziyang@huawei.com>
To:     <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
        <pabeni@redhat.com>, <morbo@google.com>, <netdev@vger.kernel.org>
CC:     <linux-kernel@vger.kernel.org>
Subject: [PATCH next-next 1/2] net: vlan: remove unnecessary err variable in vlan_init_net()
Date:   Wed, 31 Aug 2022 12:09:56 +0800
Message-ID: <e68a18f6bfeeb5d05c1506da65f308e8e3d29013.1661916732.git.william.xuanziyang@huawei.com>
In-Reply-To: <cover.1661916732.git.william.xuanziyang@huawei.com>
References: <cover.1661916732.git.william.xuanziyang@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Precedence: bulk

Return vlan_init_net() directly in vlan_init_net(), remove unnecessary
err variable. Thus code looks more concise.

Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
---
 net/8021q/vlan.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index e40aa3e3641c..aaef80fdd852 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -658,13 +658,10 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 static int __net_init vlan_init_net(struct net *net)
 {
 	struct vlan_net *vn = net_generic(net, vlan_net_id);
-	int err;
 
 	vn->name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
 
-	err = vlan_proc_init(net);
-
-	return err;
+	return vlan_proc_init(net);
 }
 
 static void __net_exit vlan_exit_net(struct net *net)
-- 
2.25.1