Give two small refactors to make code more concise.
Ziyang Xuan (2):
net: vlan: remove unnecessary err variable in vlan_init_net()
net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()
net/8021q/vlan.c | 5 +----
net/8021q/vlan_core.c | 22 +++++++++-------------
2 files changed, 10 insertions(+), 17 deletions(-)
--
2.25.1
Return vlan_init_net() directly in vlan_init_net(), remove unnecessary
err variable. Thus code looks more concise.
Signed-off-by: Ziyang Xuan <[email protected]>
---
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
Hello,
On Wed, 2022-08-31 at 12:09 +0800, Ziyang Xuan wrote:
> Give two small refactors to make code more concise.
>
> Ziyang Xuan (2):
> net: vlan: remove unnecessary err variable in vlan_init_net()
> net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()
>
> net/8021q/vlan.c | 5 +----
> net/8021q/vlan_core.c | 22 +++++++++-------------
> 2 files changed, 10 insertions(+), 17 deletions(-)
The patches look correct to me, but I think is better to defer this
kind of nun-functional refactors to some work actually doing new stuff,
to avoid unneeded noise.
Note that I merged a few other clean-up recently, but e.g. they at
least formally removed some unneeded branch.
Sorry, I'm not going to apply this series.
Cheers,
Paolo
在 2022/9/1 21:28, Paolo Abeni 写道:
> Hello,
>
> On Wed, 2022-08-31 at 12:09 +0800, Ziyang Xuan wrote:
>> Give two small refactors to make code more concise.
>>
>> Ziyang Xuan (2):
>> net: vlan: remove unnecessary err variable in vlan_init_net()
>> net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()
>>
>> net/8021q/vlan.c | 5 +----
>> net/8021q/vlan_core.c | 22 +++++++++-------------
>> 2 files changed, 10 insertions(+), 17 deletions(-)
>
> The patches look correct to me, but I think is better to defer this
> kind of nun-functional refactors to some work actually doing new stuff,
> to avoid unneeded noise.
>
> Note that I merged a few other clean-up recently, but e.g. they at
> least formally removed some unneeded branch.
>
> Sorry, I'm not going to apply this series.
No problem, I will try to dig deeper.
>
> Cheers,
>
> Paolo
>
> .
>