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/hp-plus.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/hp-plus.c')
-rw-r--r-- | drivers/net/hp-plus.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index efdbcad63c67..82bffc3cabdf 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
@@ -351,7 +351,6 @@ hpp_reset_8390(struct net_device *dev) | |||
351 | printk("%s: hp_reset_8390() did not complete.\n", dev->name); | 351 | printk("%s: hp_reset_8390() did not complete.\n", dev->name); |
352 | 352 | ||
353 | if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies); | 353 | if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies); |
354 | return; | ||
355 | } | 354 | } |
356 | 355 | ||
357 | /* The programmed-I/O version of reading the 4 byte 8390 specific header. | 356 | /* The programmed-I/O version of reading the 4 byte 8390 specific header. |
@@ -422,7 +421,6 @@ hpp_io_block_output(struct net_device *dev, int count, | |||
422 | int ioaddr = dev->base_addr - NIC_OFFSET; | 421 | int ioaddr = dev->base_addr - NIC_OFFSET; |
423 | outw(start_page << 8, ioaddr + HPP_OUT_ADDR); | 422 | outw(start_page << 8, ioaddr + HPP_OUT_ADDR); |
424 | outsl(ioaddr + HP_DATAPORT, buf, (count+3)>>2); | 423 | outsl(ioaddr + HP_DATAPORT, buf, (count+3)>>2); |
425 | return; | ||
426 | } | 424 | } |
427 | 425 | ||
428 | static void | 426 | static void |
@@ -436,8 +434,6 @@ hpp_mem_block_output(struct net_device *dev, int count, | |||
436 | outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION); | 434 | outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION); |
437 | memcpy_toio(ei_status.mem, buf, (count + 3) & ~3); | 435 | memcpy_toio(ei_status.mem, buf, (count + 3) & ~3); |
438 | outw(option_reg, ioaddr + HPP_OPTION); | 436 | outw(option_reg, ioaddr + HPP_OPTION); |
439 | |||
440 | return; | ||
441 | } | 437 | } |
442 | 438 | ||
443 | 439 | ||