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/sunrpc | |
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/sunrpc')
-rw-r--r-- | net/sunrpc/clnt.c | 1 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 1 | ||||
-rw-r--r-- | net/sunrpc/xprt.c | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 4 |
4 files changed, 0 insertions, 7 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 19c9983d5360..462462eaf296 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -1518,7 +1518,6 @@ call_refreshresult(struct rpc_task *task) | |||
1518 | task->tk_action = call_refresh; | 1518 | task->tk_action = call_refresh; |
1519 | if (status != -ETIMEDOUT) | 1519 | if (status != -ETIMEDOUT) |
1520 | rpc_delay(task, 3*HZ); | 1520 | rpc_delay(task, 3*HZ); |
1521 | return; | ||
1522 | } | 1521 | } |
1523 | 1522 | ||
1524 | static __be32 * | 1523 | static __be32 * |
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index ce0d5b35c2ac..76e504bf74d0 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -150,7 +150,6 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh) | |||
150 | } | 150 | } |
151 | break; | 151 | break; |
152 | } | 152 | } |
153 | return; | ||
154 | } | 153 | } |
155 | 154 | ||
156 | /* | 155 | /* |
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 699ade68aac1..2e3d502ffe87 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -716,7 +716,6 @@ void xprt_connect(struct rpc_task *task) | |||
716 | xprt->stat.connect_start = jiffies; | 716 | xprt->stat.connect_start = jiffies; |
717 | xprt->ops->connect(task); | 717 | xprt->ops->connect(task); |
718 | } | 718 | } |
719 | return; | ||
720 | } | 719 | } |
721 | 720 | ||
722 | static void xprt_connect_status(struct rpc_task *task) | 721 | static void xprt_connect_status(struct rpc_task *task) |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 9847c30b5001..6e0df664b255 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1050,8 +1050,6 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt, | |||
1050 | if (transport->tcp_flags & TCP_RCV_LAST_FRAG) | 1050 | if (transport->tcp_flags & TCP_RCV_LAST_FRAG) |
1051 | transport->tcp_flags &= ~TCP_RCV_COPY_DATA; | 1051 | transport->tcp_flags &= ~TCP_RCV_COPY_DATA; |
1052 | } | 1052 | } |
1053 | |||
1054 | return; | ||
1055 | } | 1053 | } |
1056 | 1054 | ||
1057 | /* | 1055 | /* |
@@ -2210,7 +2208,6 @@ static int bc_send_request(struct rpc_task *task) | |||
2210 | 2208 | ||
2211 | static void bc_close(struct rpc_xprt *xprt) | 2209 | static void bc_close(struct rpc_xprt *xprt) |
2212 | { | 2210 | { |
2213 | return; | ||
2214 | } | 2211 | } |
2215 | 2212 | ||
2216 | /* | 2213 | /* |
@@ -2220,7 +2217,6 @@ static void bc_close(struct rpc_xprt *xprt) | |||
2220 | 2217 | ||
2221 | static void bc_destroy(struct rpc_xprt *xprt) | 2218 | static void bc_destroy(struct rpc_xprt *xprt) |
2222 | { | 2219 | { |
2223 | return; | ||
2224 | } | 2220 | } |
2225 | 2221 | ||
2226 | static struct rpc_xprt_ops xs_udp_ops = { | 2222 | static struct rpc_xprt_ops xs_udp_ops = { |