ipv6: drop unneeded goto
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 28 May 2015 21:02:17 +0000 (23:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 31 May 2015 06:48:36 +0000 (23:48 -0700)
Delete jump to a label on the next line, when that label is not
used elsewhere.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r@
identifier l;
@@

-if (...) goto l;
-l:
// </smpl>

Also remove the unnecessary ret variable.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/raw.c

index 484a5c1..ca4700c 100644 (file)
@@ -1327,13 +1327,7 @@ static struct inet_protosw rawv6_protosw = {
 
 int __init rawv6_init(void)
 {
-       int ret;
-
-       ret = inet6_register_protosw(&rawv6_protosw);
-       if (ret)
-               goto out;
-out:
-       return ret;
+       return inet6_register_protosw(&rawv6_protosw);
 }
 
 void rawv6_exit(void)