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/wireless/ipw2x00 | |
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/wireless/ipw2x00')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_rx.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 2088ac029b35..a59ceb26cd83 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -3239,7 +3239,6 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) | |||
3239 | IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX, | 3239 | IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX, |
3240 | txq->next); | 3240 | txq->next); |
3241 | } | 3241 | } |
3242 | return; | ||
3243 | } | 3242 | } |
3244 | 3243 | ||
3245 | static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) | 3244 | static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 82de71a3aea7..3aa3bb18f615 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
@@ -2607,8 +2607,6 @@ static inline void eeprom_write_reg(struct ipw_priv *p, u32 data) | |||
2607 | 2607 | ||
2608 | /* the eeprom requires some time to complete the operation */ | 2608 | /* the eeprom requires some time to complete the operation */ |
2609 | udelay(p->eeprom_delay); | 2609 | udelay(p->eeprom_delay); |
2610 | |||
2611 | return; | ||
2612 | } | 2610 | } |
2613 | 2611 | ||
2614 | /* perform a chip select operation */ | 2612 | /* perform a chip select operation */ |
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 39a34da52d52..0de1b1893220 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c | |||
@@ -918,7 +918,6 @@ void libipw_rx_any(struct libipw_device *ieee, | |||
918 | drop_free: | 918 | drop_free: |
919 | dev_kfree_skb_irq(skb); | 919 | dev_kfree_skb_irq(skb); |
920 | ieee->dev->stats.rx_dropped++; | 920 | ieee->dev->stats.rx_dropped++; |
921 | return; | ||
922 | } | 921 | } |
923 | 922 | ||
924 | #define MGMT_FRAME_FIXED_PART_LENGTH 0x24 | 923 | #define MGMT_FRAME_FIXED_PART_LENGTH 0x24 |