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/qla3xxx.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/qla3xxx.c')
-rw-r--r-- | drivers/net/qla3xxx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 01a6ca303a17..54ebb65ada18 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -222,7 +222,6 @@ static void ql_write_common_reg_l(struct ql3_adapter *qdev, | |||
222 | writel(value, reg); | 222 | writel(value, reg); |
223 | readl(reg); | 223 | readl(reg); |
224 | spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); | 224 | spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); |
225 | return; | ||
226 | } | 225 | } |
227 | 226 | ||
228 | static void ql_write_common_reg(struct ql3_adapter *qdev, | 227 | static void ql_write_common_reg(struct ql3_adapter *qdev, |
@@ -230,7 +229,6 @@ static void ql_write_common_reg(struct ql3_adapter *qdev, | |||
230 | { | 229 | { |
231 | writel(value, reg); | 230 | writel(value, reg); |
232 | readl(reg); | 231 | readl(reg); |
233 | return; | ||
234 | } | 232 | } |
235 | 233 | ||
236 | static void ql_write_nvram_reg(struct ql3_adapter *qdev, | 234 | static void ql_write_nvram_reg(struct ql3_adapter *qdev, |
@@ -239,7 +237,6 @@ static void ql_write_nvram_reg(struct ql3_adapter *qdev, | |||
239 | writel(value, reg); | 237 | writel(value, reg); |
240 | readl(reg); | 238 | readl(reg); |
241 | udelay(1); | 239 | udelay(1); |
242 | return; | ||
243 | } | 240 | } |
244 | 241 | ||
245 | static void ql_write_page0_reg(struct ql3_adapter *qdev, | 242 | static void ql_write_page0_reg(struct ql3_adapter *qdev, |
@@ -249,7 +246,6 @@ static void ql_write_page0_reg(struct ql3_adapter *qdev, | |||
249 | ql_set_register_page(qdev,0); | 246 | ql_set_register_page(qdev,0); |
250 | writel(value, reg); | 247 | writel(value, reg); |
251 | readl(reg); | 248 | readl(reg); |
252 | return; | ||
253 | } | 249 | } |
254 | 250 | ||
255 | /* | 251 | /* |
@@ -262,7 +258,6 @@ static void ql_write_page1_reg(struct ql3_adapter *qdev, | |||
262 | ql_set_register_page(qdev,1); | 258 | ql_set_register_page(qdev,1); |
263 | writel(value, reg); | 259 | writel(value, reg); |
264 | readl(reg); | 260 | readl(reg); |
265 | return; | ||
266 | } | 261 | } |
267 | 262 | ||
268 | /* | 263 | /* |
@@ -275,7 +270,6 @@ static void ql_write_page2_reg(struct ql3_adapter *qdev, | |||
275 | ql_set_register_page(qdev,2); | 270 | ql_set_register_page(qdev,2); |
276 | writel(value, reg); | 271 | writel(value, reg); |
277 | readl(reg); | 272 | readl(reg); |
278 | return; | ||
279 | } | 273 | } |
280 | 274 | ||
281 | static void ql_disable_interrupts(struct ql3_adapter *qdev) | 275 | static void ql_disable_interrupts(struct ql3_adapter *qdev) |