diff options
author | Joe Perches <joe@perches.com> | 2010-05-14 03:19:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-14 03:19:28 -0400 |
commit | a4b770972b8f819e408d7cc3ae9637e15bff62f6 (patch) | |
tree | 62e3c413b084c106d750cf6cc0701709cde30100 /drivers/net/wimax/i2400m/rx.c | |
parent | 21ce849ba5cc178740c6532ba3dded852296ad91 (diff) |
drivers/net: Remove unnecessary returns from void function()s
This patch removes from drivers/net/ 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.
It also does not remove null void functions with return.
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; }'
with some cleanups by hand.
Compile tested x86 allmodconfig only.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wimax/i2400m/rx.c')
-rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index fa2e11e5b4b9..5fa841d913b2 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
@@ -313,7 +313,6 @@ error_waiter_cancelled: | |||
313 | kfree_skb(ack_skb); | 313 | kfree_skb(ack_skb); |
314 | error_no_waiter: | 314 | error_no_waiter: |
315 | spin_unlock_irqrestore(&i2400m->rx_lock, flags); | 315 | spin_unlock_irqrestore(&i2400m->rx_lock, flags); |
316 | return; | ||
317 | } | 316 | } |
318 | 317 | ||
319 | 318 | ||
@@ -718,7 +717,6 @@ void __i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq, | |||
718 | out: | 717 | out: |
719 | d_fnend(4, dev, "(i2400m %p roq %p skb %p sn %u nsn %d) = void\n", | 718 | d_fnend(4, dev, "(i2400m %p roq %p skb %p sn %u nsn %d) = void\n", |
720 | i2400m, roq, skb, sn, nsn); | 719 | i2400m, roq, skb, sn, nsn); |
721 | return; | ||
722 | } | 720 | } |
723 | 721 | ||
724 | 722 | ||
@@ -798,7 +796,6 @@ void i2400m_roq_reset(struct i2400m *i2400m, struct i2400m_roq *roq) | |||
798 | } | 796 | } |
799 | roq->ws = 0; | 797 | roq->ws = 0; |
800 | d_fnend(2, dev, "(i2400m %p roq %p) = void\n", i2400m, roq); | 798 | d_fnend(2, dev, "(i2400m %p roq %p) = void\n", i2400m, roq); |
801 | return; | ||
802 | } | 799 | } |
803 | 800 | ||
804 | 801 | ||
@@ -837,7 +834,6 @@ void i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq, | |||
837 | } | 834 | } |
838 | d_fnend(2, dev, "(i2400m %p roq %p skb %p lbn %u) = void\n", | 835 | d_fnend(2, dev, "(i2400m %p roq %p skb %p lbn %u) = void\n", |
839 | i2400m, roq, skb, lbn); | 836 | i2400m, roq, skb, lbn); |
840 | return; | ||
841 | } | 837 | } |
842 | 838 | ||
843 | 839 | ||
@@ -863,7 +859,6 @@ void i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq, | |||
863 | i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_WS, | 859 | i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_WS, |
864 | old_ws, len, sn, nsn, roq->ws); | 860 | old_ws, len, sn, nsn, roq->ws); |
865 | d_fnstart(2, dev, "(i2400m %p roq %p sn %u) = void\n", i2400m, roq, sn); | 861 | d_fnstart(2, dev, "(i2400m %p roq %p sn %u) = void\n", i2400m, roq, sn); |
866 | return; | ||
867 | } | 862 | } |
868 | 863 | ||
869 | 864 | ||
@@ -912,7 +907,6 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq, | |||
912 | } | 907 | } |
913 | d_fnend(2, dev, "(i2400m %p roq %p skb %p sn %u) = void\n", | 908 | d_fnend(2, dev, "(i2400m %p roq %p skb %p sn %u) = void\n", |
914 | i2400m, roq, skb, sn); | 909 | i2400m, roq, skb, sn); |
915 | return; | ||
916 | } | 910 | } |
917 | 911 | ||
918 | 912 | ||
@@ -1041,7 +1035,6 @@ error_skb_clone: | |||
1041 | error: | 1035 | error: |
1042 | d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p " | 1036 | d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p " |
1043 | "size %zu) = void\n", i2400m, skb_rx, single_last, payload, size); | 1037 | "size %zu) = void\n", i2400m, skb_rx, single_last, payload, size); |
1044 | return; | ||
1045 | } | 1038 | } |
1046 | 1039 | ||
1047 | 1040 | ||