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/ixgbe/ixgbe_ethtool.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/ixgbe/ixgbe_ethtool.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_ethtool.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index dc7fd5b70bc3..251767d9fe79 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -1493,8 +1493,6 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter) | |||
1493 | tx_ring->tx_buffer_info = NULL; | 1493 | tx_ring->tx_buffer_info = NULL; |
1494 | kfree(rx_ring->rx_buffer_info); | 1494 | kfree(rx_ring->rx_buffer_info); |
1495 | rx_ring->rx_buffer_info = NULL; | 1495 | rx_ring->rx_buffer_info = NULL; |
1496 | |||
1497 | return; | ||
1498 | } | 1496 | } |
1499 | 1497 | ||
1500 | static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) | 1498 | static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) |
@@ -1973,8 +1971,6 @@ static void ixgbe_get_wol(struct net_device *netdev, | |||
1973 | wol->wolopts |= WAKE_BCAST; | 1971 | wol->wolopts |= WAKE_BCAST; |
1974 | if (adapter->wol & IXGBE_WUFC_MAG) | 1972 | if (adapter->wol & IXGBE_WUFC_MAG) |
1975 | wol->wolopts |= WAKE_MAGIC; | 1973 | wol->wolopts |= WAKE_MAGIC; |
1976 | |||
1977 | return; | ||
1978 | } | 1974 | } |
1979 | 1975 | ||
1980 | static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | 1976 | static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) |