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/atm/mpoa_caches.c | |
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/atm/mpoa_caches.c')
-rw-r--r-- | net/atm/mpoa_caches.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c index e773d8336918..d1b2d9a03144 100644 --- a/net/atm/mpoa_caches.c +++ b/net/atm/mpoa_caches.c | |||
@@ -182,8 +182,6 @@ static void in_cache_put(in_cache_entry *entry) | |||
182 | memset(entry, 0, sizeof(in_cache_entry)); | 182 | memset(entry, 0, sizeof(in_cache_entry)); |
183 | kfree(entry); | 183 | kfree(entry); |
184 | } | 184 | } |
185 | |||
186 | return; | ||
187 | } | 185 | } |
188 | 186 | ||
189 | /* | 187 | /* |
@@ -221,8 +219,6 @@ static void in_cache_remove_entry(in_cache_entry *entry, | |||
221 | } | 219 | } |
222 | vcc_release_async(vcc, -EPIPE); | 220 | vcc_release_async(vcc, -EPIPE); |
223 | } | 221 | } |
224 | |||
225 | return; | ||
226 | } | 222 | } |
227 | 223 | ||
228 | /* Call this every MPC-p2 seconds... Not exactly correct solution, | 224 | /* Call this every MPC-p2 seconds... Not exactly correct solution, |
@@ -248,8 +244,6 @@ static void clear_count_and_expired(struct mpoa_client *client) | |||
248 | entry = next_entry; | 244 | entry = next_entry; |
249 | } | 245 | } |
250 | write_unlock_bh(&client->ingress_lock); | 246 | write_unlock_bh(&client->ingress_lock); |
251 | |||
252 | return; | ||
253 | } | 247 | } |
254 | 248 | ||
255 | /* Call this every MPC-p4 seconds. */ | 249 | /* Call this every MPC-p4 seconds. */ |
@@ -334,8 +328,6 @@ static void in_destroy_cache(struct mpoa_client *mpc) | |||
334 | while (mpc->in_cache != NULL) | 328 | while (mpc->in_cache != NULL) |
335 | mpc->in_ops->remove_entry(mpc->in_cache, mpc); | 329 | mpc->in_ops->remove_entry(mpc->in_cache, mpc); |
336 | write_unlock_irq(&mpc->ingress_lock); | 330 | write_unlock_irq(&mpc->ingress_lock); |
337 | |||
338 | return; | ||
339 | } | 331 | } |
340 | 332 | ||
341 | static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, | 333 | static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, |
@@ -427,8 +419,6 @@ static void eg_cache_put(eg_cache_entry *entry) | |||
427 | memset(entry, 0, sizeof(eg_cache_entry)); | 419 | memset(entry, 0, sizeof(eg_cache_entry)); |
428 | kfree(entry); | 420 | kfree(entry); |
429 | } | 421 | } |
430 | |||
431 | return; | ||
432 | } | 422 | } |
433 | 423 | ||
434 | /* | 424 | /* |
@@ -463,8 +453,6 @@ static void eg_cache_remove_entry(eg_cache_entry *entry, | |||
463 | } | 453 | } |
464 | vcc_release_async(vcc, -EPIPE); | 454 | vcc_release_async(vcc, -EPIPE); |
465 | } | 455 | } |
466 | |||
467 | return; | ||
468 | } | 456 | } |
469 | 457 | ||
470 | static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, | 458 | static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, |
@@ -509,8 +497,6 @@ static void update_eg_cache_entry(eg_cache_entry *entry, uint16_t holding_time) | |||
509 | do_gettimeofday(&(entry->tv)); | 497 | do_gettimeofday(&(entry->tv)); |
510 | entry->entry_state = EGRESS_RESOLVED; | 498 | entry->entry_state = EGRESS_RESOLVED; |
511 | entry->ctrl_info.holding_time = holding_time; | 499 | entry->ctrl_info.holding_time = holding_time; |
512 | |||
513 | return; | ||
514 | } | 500 | } |
515 | 501 | ||
516 | static void clear_expired(struct mpoa_client *client) | 502 | static void clear_expired(struct mpoa_client *client) |
@@ -537,8 +523,6 @@ static void clear_expired(struct mpoa_client *client) | |||
537 | entry = next_entry; | 523 | entry = next_entry; |
538 | } | 524 | } |
539 | write_unlock_irq(&client->egress_lock); | 525 | write_unlock_irq(&client->egress_lock); |
540 | |||
541 | return; | ||
542 | } | 526 | } |
543 | 527 | ||
544 | static void eg_destroy_cache(struct mpoa_client *mpc) | 528 | static void eg_destroy_cache(struct mpoa_client *mpc) |
@@ -547,8 +531,6 @@ static void eg_destroy_cache(struct mpoa_client *mpc) | |||
547 | while (mpc->eg_cache != NULL) | 531 | while (mpc->eg_cache != NULL) |
548 | mpc->eg_ops->remove_entry(mpc->eg_cache, mpc); | 532 | mpc->eg_ops->remove_entry(mpc->eg_cache, mpc); |
549 | write_unlock_irq(&mpc->egress_lock); | 533 | write_unlock_irq(&mpc->egress_lock); |
550 | |||
551 | return; | ||
552 | } | 534 | } |
553 | 535 | ||
554 | 536 | ||
@@ -584,6 +566,4 @@ void atm_mpoa_init_cache(struct mpoa_client *mpc) | |||
584 | { | 566 | { |
585 | mpc->in_ops = &ingress_ops; | 567 | mpc->in_ops = &ingress_ops; |
586 | mpc->eg_ops = &egress_ops; | 568 | mpc->eg_ops = &egress_ops; |
587 | |||
588 | return; | ||
589 | } | 569 | } |