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/sis900.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/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 11f7ebedcde5..bbbded76ff14 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -858,7 +858,6 @@ static void mdio_reset(long mdio_addr) | |||
858 | outl(MDDIR | MDIO | MDC, mdio_addr); | 858 | outl(MDDIR | MDIO | MDC, mdio_addr); |
859 | mdio_delay(); | 859 | mdio_delay(); |
860 | } | 860 | } |
861 | return; | ||
862 | } | 861 | } |
863 | 862 | ||
864 | /** | 863 | /** |
@@ -953,8 +952,6 @@ static void mdio_write(struct net_device *net_dev, int phy_id, int location, | |||
953 | mdio_delay(); | 952 | mdio_delay(); |
954 | } | 953 | } |
955 | outl(0x00, mdio_addr); | 954 | outl(0x00, mdio_addr); |
956 | |||
957 | return; | ||
958 | } | 955 | } |
959 | 956 | ||
960 | 957 | ||
@@ -1264,7 +1261,6 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision) | |||
1264 | mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, | 1261 | mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, |
1265 | (reg14h | 0x2000) & 0xBFFF); | 1262 | (reg14h | 0x2000) & 0xBFFF); |
1266 | } | 1263 | } |
1267 | return; | ||
1268 | } | 1264 | } |
1269 | 1265 | ||
1270 | /** | 1266 | /** |
@@ -1560,7 +1556,6 @@ static void sis900_tx_timeout(struct net_device *net_dev) | |||
1560 | 1556 | ||
1561 | /* Enable all known interrupts by setting the interrupt mask. */ | 1557 | /* Enable all known interrupts by setting the interrupt mask. */ |
1562 | outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); | 1558 | outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); |
1563 | return; | ||
1564 | } | 1559 | } |
1565 | 1560 | ||
1566 | /** | 1561 | /** |
@@ -2330,8 +2325,6 @@ static void set_rx_mode(struct net_device *net_dev) | |||
2330 | /* restore cr */ | 2325 | /* restore cr */ |
2331 | outl(cr_saved, ioaddr + cr); | 2326 | outl(cr_saved, ioaddr + cr); |
2332 | } | 2327 | } |
2333 | |||
2334 | return; | ||
2335 | } | 2328 | } |
2336 | 2329 | ||
2337 | /** | 2330 | /** |