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/netlabel | |
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/netlabel')
-rw-r--r-- | net/netlabel/netlabel_addrlist.h | 2 | ||||
-rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/net/netlabel/netlabel_addrlist.h b/net/netlabel/netlabel_addrlist.h index 07ae7fd82be..1c1c093cf27 100644 --- a/net/netlabel/netlabel_addrlist.h +++ b/net/netlabel/netlabel_addrlist.h | |||
@@ -130,7 +130,6 @@ static inline void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf, | |||
130 | int src, const char *dev, | 130 | int src, const char *dev, |
131 | __be32 addr, __be32 mask) | 131 | __be32 addr, __be32 mask) |
132 | { | 132 | { |
133 | return; | ||
134 | } | 133 | } |
135 | #endif | 134 | #endif |
136 | 135 | ||
@@ -203,7 +202,6 @@ static inline void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, | |||
203 | const struct in6_addr *addr, | 202 | const struct in6_addr *addr, |
204 | const struct in6_addr *mask) | 203 | const struct in6_addr *mask) |
205 | { | 204 | { |
206 | return; | ||
207 | } | 205 | } |
208 | #endif | 206 | #endif |
209 | #endif /* IPV6 */ | 207 | #endif /* IPV6 */ |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index a3d64aabe2f..e2b0a680dd5 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
@@ -670,7 +670,6 @@ static void netlbl_unlhsh_condremove_iface(struct netlbl_unlhsh_iface *iface) | |||
670 | 670 | ||
671 | unlhsh_condremove_failure: | 671 | unlhsh_condremove_failure: |
672 | spin_unlock(&netlbl_unlhsh_lock); | 672 | spin_unlock(&netlbl_unlhsh_lock); |
673 | return; | ||
674 | } | 673 | } |
675 | 674 | ||
676 | /** | 675 | /** |