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/stmmac/dwmac100_dma.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/stmmac/dwmac100_dma.c')
-rw-r--r-- | drivers/net/stmmac/dwmac100_dma.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/stmmac/dwmac100_dma.c index 96d098d68ad6..2fece7b72727 100644 --- a/drivers/net/stmmac/dwmac100_dma.c +++ b/drivers/net/stmmac/dwmac100_dma.c | |||
@@ -71,8 +71,6 @@ static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode, | |||
71 | csr6 |= DMA_CONTROL_TTC_128; | 71 | csr6 |= DMA_CONTROL_TTC_128; |
72 | 72 | ||
73 | writel(csr6, ioaddr + DMA_CONTROL); | 73 | writel(csr6, ioaddr + DMA_CONTROL); |
74 | |||
75 | return; | ||
76 | } | 74 | } |
77 | 75 | ||
78 | static void dwmac100_dump_dma_regs(unsigned long ioaddr) | 76 | static void dwmac100_dump_dma_regs(unsigned long ioaddr) |
@@ -88,7 +86,6 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr) | |||
88 | DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR)); | 86 | DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR)); |
89 | CHIP_DBG(KERN_DEBUG "\t CSR21 (offset 0x%x): 0x%08x\n", | 87 | CHIP_DBG(KERN_DEBUG "\t CSR21 (offset 0x%x): 0x%08x\n", |
90 | DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR)); | 88 | DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR)); |
91 | return; | ||
92 | } | 89 | } |
93 | 90 | ||
94 | /* DMA controller has two counters to track the number of | 91 | /* DMA controller has two counters to track the number of |
@@ -119,7 +116,6 @@ static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x, | |||
119 | x->rx_missed_cntr += miss_f; | 116 | x->rx_missed_cntr += miss_f; |
120 | } | 117 | } |
121 | } | 118 | } |
122 | return; | ||
123 | } | 119 | } |
124 | 120 | ||
125 | struct stmmac_dma_ops dwmac100_dma_ops = { | 121 | struct stmmac_dma_ops dwmac100_dma_ops = { |