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/atl1e/atl1e_main.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/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 7dd33776de00..1acea5774e89 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -707,8 +707,6 @@ static void atl1e_init_ring_resources(struct atl1e_adapter *adapter) | |||
707 | adapter->ring_vir_addr = NULL; | 707 | adapter->ring_vir_addr = NULL; |
708 | adapter->rx_ring.desc = NULL; | 708 | adapter->rx_ring.desc = NULL; |
709 | rwlock_init(&adapter->tx_ring.tx_lock); | 709 | rwlock_init(&adapter->tx_ring.tx_lock); |
710 | |||
711 | return; | ||
712 | } | 710 | } |
713 | 711 | ||
714 | /* | 712 | /* |
@@ -905,8 +903,6 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter) | |||
905 | AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size); | 903 | AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size); |
906 | /* Load all of base address above */ | 904 | /* Load all of base address above */ |
907 | AT_WRITE_REG(hw, REG_LOAD_PTR, 1); | 905 | AT_WRITE_REG(hw, REG_LOAD_PTR, 1); |
908 | |||
909 | return; | ||
910 | } | 906 | } |
911 | 907 | ||
912 | static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) | 908 | static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) |
@@ -950,7 +946,6 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) | |||
950 | (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK) | 946 | (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK) |
951 | << TXQ_CTRL_NUM_TPD_BURST_SHIFT) | 947 | << TXQ_CTRL_NUM_TPD_BURST_SHIFT) |
952 | | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN); | 948 | | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN); |
953 | return; | ||
954 | } | 949 | } |
955 | 950 | ||
956 | static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) | 951 | static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) |
@@ -1004,7 +999,6 @@ static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) | |||
1004 | RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN; | 999 | RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN; |
1005 | 1000 | ||
1006 | AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data); | 1001 | AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data); |
1007 | return; | ||
1008 | } | 1002 | } |
1009 | 1003 | ||
1010 | static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) | 1004 | static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) |
@@ -1024,7 +1018,6 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) | |||
1024 | << DMA_CTRL_DMAW_DLY_CNT_SHIFT; | 1018 | << DMA_CTRL_DMAW_DLY_CNT_SHIFT; |
1025 | 1019 | ||
1026 | AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data); | 1020 | AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data); |
1027 | return; | ||
1028 | } | 1021 | } |
1029 | 1022 | ||
1030 | static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) | 1023 | static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) |