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/epic100.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/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index a48da2dc907f..6838dfc9ef23 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -652,7 +652,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value) | |||
652 | if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0) | 652 | if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0) |
653 | break; | 653 | break; |
654 | } | 654 | } |
655 | return; | ||
656 | } | 655 | } |
657 | 656 | ||
658 | 657 | ||
@@ -840,7 +839,6 @@ static void epic_restart(struct net_device *dev) | |||
840 | " interrupt %4.4x.\n", | 839 | " interrupt %4.4x.\n", |
841 | dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL), | 840 | dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL), |
842 | (int)inl(ioaddr + INTSTAT)); | 841 | (int)inl(ioaddr + INTSTAT)); |
843 | return; | ||
844 | } | 842 | } |
845 | 843 | ||
846 | static void check_media(struct net_device *dev) | 844 | static void check_media(struct net_device *dev) |
@@ -958,7 +956,6 @@ static void epic_init_ring(struct net_device *dev) | |||
958 | (i+1)*sizeof(struct epic_tx_desc); | 956 | (i+1)*sizeof(struct epic_tx_desc); |
959 | } | 957 | } |
960 | ep->tx_ring[i-1].next = ep->tx_ring_dma; | 958 | ep->tx_ring[i-1].next = ep->tx_ring_dma; |
961 | return; | ||
962 | } | 959 | } |
963 | 960 | ||
964 | static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | 961 | static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) |
@@ -1413,7 +1410,6 @@ static void set_rx_mode(struct net_device *dev) | |||
1413 | outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4); | 1410 | outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4); |
1414 | memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter)); | 1411 | memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter)); |
1415 | } | 1412 | } |
1416 | return; | ||
1417 | } | 1413 | } |
1418 | 1414 | ||
1419 | static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) | 1415 | static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) |