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/phy | |
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/phy')
-rw-r--r-- | drivers/net/phy/national.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c index 729ab29ba28c..a73ba0bcc0ce 100644 --- a/drivers/net/phy/national.c +++ b/drivers/net/phy/national.c | |||
@@ -97,7 +97,6 @@ static void ns_giga_speed_fallback(struct phy_device *phydev, int mode) | |||
97 | phy_write(phydev, NS_EXP_MEM_DATA, 0x0008); | 97 | phy_write(phydev, NS_EXP_MEM_DATA, 0x0008); |
98 | phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN)); | 98 | phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN)); |
99 | phy_write(phydev, LED_CTRL_REG, mode); | 99 | phy_write(phydev, LED_CTRL_REG, mode); |
100 | return; | ||
101 | } | 100 | } |
102 | 101 | ||
103 | static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) | 102 | static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) |
@@ -110,8 +109,6 @@ static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) | |||
110 | 109 | ||
111 | printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n", | 110 | printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n", |
112 | (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); | 111 | (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); |
113 | |||
114 | return; | ||
115 | } | 112 | } |
116 | 113 | ||
117 | static int ns_config_init(struct phy_device *phydev) | 114 | static int ns_config_init(struct phy_device *phydev) |