aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hp.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-05-14 03:19:28 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-14 03:19:28 -0400
commita4b770972b8f819e408d7cc3ae9637e15bff62f6 (patch)
tree62e3c413b084c106d750cf6cc0701709cde30100 /drivers/net/hp.c
parent21ce849ba5cc178740c6532ba3dded852296ad91 (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.c')
-rw-r--r--drivers/net/hp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 5c4d78c1ff42..86ececd3c658 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -240,7 +240,6 @@ hp_reset_8390(struct net_device *dev)
240 printk("%s: hp_reset_8390() did not complete.\n", dev->name); 240 printk("%s: hp_reset_8390() did not complete.\n", dev->name);
241 241
242 if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies); 242 if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies);
243 return;
244} 243}
245 244
246static void 245static void
@@ -360,7 +359,6 @@ hp_block_output(struct net_device *dev, int count,
360 dev->name, (start_page << 8) + count, addr); 359 dev->name, (start_page << 8) + count, addr);
361 } 360 }
362 outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE); 361 outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE);
363 return;
364} 362}
365 363
366/* This function resets the ethercard if something screws up. */ 364/* This function resets the ethercard if something screws up. */
@@ -371,7 +369,6 @@ hp_init_card(struct net_device *dev)
371 NS8390p_init(dev, 0); 369 NS8390p_init(dev, 0);
372 outb_p(irqmap[irq&0x0f] | HP_RUN, 370 outb_p(irqmap[irq&0x0f] | HP_RUN,
373 dev->base_addr - NIC_OFFSET + HP_CONFIGURE); 371 dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
374 return;
375} 372}
376 373
377#ifdef MODULE 374#ifdef MODULE