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/sundance.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/sundance.c')
-rw-r--r-- | drivers/net/sundance.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 16803251a999..2678588ea4b2 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -788,7 +788,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val | |||
788 | iowrite8(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr); | 788 | iowrite8(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr); |
789 | mdio_delay(); | 789 | mdio_delay(); |
790 | } | 790 | } |
791 | return; | ||
792 | } | 791 | } |
793 | 792 | ||
794 | static int mdio_wait_link(struct net_device *dev, int wait) | 793 | static int mdio_wait_link(struct net_device *dev, int wait) |
@@ -1022,7 +1021,6 @@ static void init_ring(struct net_device *dev) | |||
1022 | np->tx_skbuff[i] = NULL; | 1021 | np->tx_skbuff[i] = NULL; |
1023 | np->tx_ring[i].status = 0; | 1022 | np->tx_ring[i].status = 0; |
1024 | } | 1023 | } |
1025 | return; | ||
1026 | } | 1024 | } |
1027 | 1025 | ||
1028 | static void tx_poll (unsigned long data) | 1026 | static void tx_poll (unsigned long data) |
@@ -1049,7 +1047,6 @@ static void tx_poll (unsigned long data) | |||
1049 | if (ioread32 (np->base + TxListPtr) == 0) | 1047 | if (ioread32 (np->base + TxListPtr) == 0) |
1050 | iowrite32 (np->tx_ring_dma + head * sizeof(struct netdev_desc), | 1048 | iowrite32 (np->tx_ring_dma + head * sizeof(struct netdev_desc), |
1051 | np->base + TxListPtr); | 1049 | np->base + TxListPtr); |
1052 | return; | ||
1053 | } | 1050 | } |
1054 | 1051 | ||
1055 | static netdev_tx_t | 1052 | static netdev_tx_t |
@@ -1378,7 +1375,6 @@ not_done: | |||
1378 | if (np->budget <= 0) | 1375 | if (np->budget <= 0) |
1379 | np->budget = RX_BUDGET; | 1376 | np->budget = RX_BUDGET; |
1380 | tasklet_schedule(&np->rx_tasklet); | 1377 | tasklet_schedule(&np->rx_tasklet); |
1381 | return; | ||
1382 | } | 1378 | } |
1383 | 1379 | ||
1384 | static void refill_rx (struct net_device *dev) | 1380 | static void refill_rx (struct net_device *dev) |
@@ -1409,7 +1405,6 @@ static void refill_rx (struct net_device *dev) | |||
1409 | np->rx_ring[entry].status = 0; | 1405 | np->rx_ring[entry].status = 0; |
1410 | cnt++; | 1406 | cnt++; |
1411 | } | 1407 | } |
1412 | return; | ||
1413 | } | 1408 | } |
1414 | static void netdev_error(struct net_device *dev, int intr_status) | 1409 | static void netdev_error(struct net_device *dev, int intr_status) |
1415 | { | 1410 | { |