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/pcnet32.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/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 566fd89da861..c200c2821730 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -647,7 +647,6 @@ free_new_rx_ring: | |||
647 | (1 << size), | 647 | (1 << size), |
648 | new_rx_ring, | 648 | new_rx_ring, |
649 | new_ring_dma_addr); | 649 | new_ring_dma_addr); |
650 | return; | ||
651 | } | 650 | } |
652 | 651 | ||
653 | static void pcnet32_purge_rx_ring(struct net_device *dev) | 652 | static void pcnet32_purge_rx_ring(struct net_device *dev) |
@@ -1215,7 +1214,6 @@ static void pcnet32_rx_entry(struct net_device *dev, | |||
1215 | skb->protocol = eth_type_trans(skb, dev); | 1214 | skb->protocol = eth_type_trans(skb, dev); |
1216 | netif_receive_skb(skb); | 1215 | netif_receive_skb(skb); |
1217 | dev->stats.rx_packets++; | 1216 | dev->stats.rx_packets++; |
1218 | return; | ||
1219 | } | 1217 | } |
1220 | 1218 | ||
1221 | static int pcnet32_rx(struct net_device *dev, int budget) | 1219 | static int pcnet32_rx(struct net_device *dev, int budget) |
@@ -2623,7 +2621,6 @@ static void pcnet32_load_multicast(struct net_device *dev) | |||
2623 | for (i = 0; i < 4; i++) | 2621 | for (i = 0; i < 4; i++) |
2624 | lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i, | 2622 | lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i, |
2625 | le16_to_cpu(mcast_table[i])); | 2623 | le16_to_cpu(mcast_table[i])); |
2626 | return; | ||
2627 | } | 2624 | } |
2628 | 2625 | ||
2629 | /* | 2626 | /* |