aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-05-14 03:19:28 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-14 03:19:28 -0400
commita4b770972b8f819e408d7cc3ae9637e15bff62f6 (patch)
tree62e3c413b084c106d750cf6cc0701709cde30100 /drivers/net/s2io.c
parent21ce849ba5cc178740c6532ba3dded852296ad91 (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/s2io.c')
-rw-r--r--drivers/net/s2io.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index f155928bf14e..668327ccd8d0 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2943,7 +2943,6 @@ static void s2io_netpoll(struct net_device *dev)
2943 } 2943 }
2944 } 2944 }
2945 enable_irq(dev->irq); 2945 enable_irq(dev->irq);
2946 return;
2947} 2946}
2948#endif 2947#endif
2949 2948
@@ -4756,7 +4755,6 @@ reset:
4756 s2io_stop_all_tx_queue(sp); 4755 s2io_stop_all_tx_queue(sp);
4757 schedule_work(&sp->rst_timer_task); 4756 schedule_work(&sp->rst_timer_task);
4758 sw_stat->soft_reset_cnt++; 4757 sw_stat->soft_reset_cnt++;
4759 return;
4760} 4758}
4761 4759
4762/** 4760/**
@@ -8645,7 +8643,6 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
8645 first->truesize += skb->truesize; 8643 first->truesize += skb->truesize;
8646 lro->last_frag = skb; 8644 lro->last_frag = skb;
8647 swstats->clubbed_frms_cnt++; 8645 swstats->clubbed_frms_cnt++;
8648 return;
8649} 8646}
8650 8647
8651/** 8648/**