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/3c59x.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/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index dab2afac6ddc..d75803e6e527 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -1855,7 +1855,6 @@ leave_media_alone: | |||
1855 | mod_timer(&vp->timer, RUN_AT(next_tick)); | 1855 | mod_timer(&vp->timer, RUN_AT(next_tick)); |
1856 | if (vp->deferred) | 1856 | if (vp->deferred) |
1857 | iowrite16(FakeIntr, ioaddr + EL3_CMD); | 1857 | iowrite16(FakeIntr, ioaddr + EL3_CMD); |
1858 | return; | ||
1859 | } | 1858 | } |
1860 | 1859 | ||
1861 | static void vortex_tx_timeout(struct net_device *dev) | 1860 | static void vortex_tx_timeout(struct net_device *dev) |
@@ -2798,7 +2797,6 @@ static void update_stats(void __iomem *ioaddr, struct net_device *dev) | |||
2798 | } | 2797 | } |
2799 | 2798 | ||
2800 | EL3WINDOW(old_window >> 13); | 2799 | EL3WINDOW(old_window >> 13); |
2801 | return; | ||
2802 | } | 2800 | } |
2803 | 2801 | ||
2804 | static int vortex_nway_reset(struct net_device *dev) | 2802 | static int vortex_nway_reset(struct net_device *dev) |
@@ -3120,7 +3118,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val | |||
3120 | iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); | 3118 | iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); |
3121 | mdio_delay(); | 3119 | mdio_delay(); |
3122 | } | 3120 | } |
3123 | return; | ||
3124 | } | 3121 | } |
3125 | 3122 | ||
3126 | /* ACPI: Advanced Configuration and Power Interface. */ | 3123 | /* ACPI: Advanced Configuration and Power Interface. */ |