diff options
author | Joe Perches <joe@perches.com> | 2010-05-18 02:08:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-18 02:23:14 -0400 |
commit | 3fa21e07e6acefa31f974d57fba2b6920a7ebd1a (patch) | |
tree | 4254644ef2579e9ac96db6ec0535b5e4231fd18e /net/ipv6 | |
parent | b60b6592baa69c43a5a0f55d6300a7feaab15338 (diff) |
net: Remove unnecessary returns from void function()s
This patch removes from net/ (but not any netfilter files)
all the unnecessary return; statements that precede the
last closing brace of void functions.
It does not remove the returns that are immediately
preceded by a label as gcc doesn't like that.
Done via:
$ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ndisc.c | 2 | ||||
-rw-r--r-- | net/ipv6/proc.c | 1 | ||||
-rw-r--r-- | net/ipv6/route.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 3f7c12b70a26..0abdc242ddb7 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -890,8 +890,6 @@ out: | |||
890 | in6_ifa_put(ifp); | 890 | in6_ifa_put(ifp); |
891 | else | 891 | else |
892 | in6_dev_put(idev); | 892 | in6_dev_put(idev); |
893 | |||
894 | return; | ||
895 | } | 893 | } |
896 | 894 | ||
897 | static void ndisc_recv_na(struct sk_buff *skb) | 895 | static void ndisc_recv_na(struct sk_buff *skb) |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 458eabfbe130..566798d69f37 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -168,7 +168,6 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void __percpu **mib) | |||
168 | i & 0x100 ? "Out" : "In", i & 0xff); | 168 | i & 0x100 ? "Out" : "In", i & 0xff); |
169 | seq_printf(seq, "%-32s\t%lu\n", name, val); | 169 | seq_printf(seq, "%-32s\t%lu\n", name, val); |
170 | } | 170 | } |
171 | return; | ||
172 | } | 171 | } |
173 | 172 | ||
174 | static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib, | 173 | static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib, |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 05ebd7833043..294cbe8b0725 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -316,7 +316,6 @@ static void rt6_probe(struct rt6_info *rt) | |||
316 | #else | 316 | #else |
317 | static inline void rt6_probe(struct rt6_info *rt) | 317 | static inline void rt6_probe(struct rt6_info *rt) |
318 | { | 318 | { |
319 | return; | ||
320 | } | 319 | } |
321 | #endif | 320 | #endif |
322 | 321 | ||
@@ -1553,7 +1552,6 @@ void rt6_redirect(struct in6_addr *dest, struct in6_addr *src, | |||
1553 | 1552 | ||
1554 | out: | 1553 | out: |
1555 | dst_release(&rt->u.dst); | 1554 | dst_release(&rt->u.dst); |
1556 | return; | ||
1557 | } | 1555 | } |
1558 | 1556 | ||
1559 | /* | 1557 | /* |