aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sb1000.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/sb1000.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/sb1000.c')
-rw-r--r--drivers/net/sb1000.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index abc8eefdd4b6..a9ae505e1baf 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -426,7 +426,6 @@ sb1000_send_command(const int ioaddr[], const char* name,
426 if (sb1000_debug > 3) 426 if (sb1000_debug > 3)
427 printk(KERN_DEBUG "%s: sb1000_send_command out: %02x%02x%02x%02x" 427 printk(KERN_DEBUG "%s: sb1000_send_command out: %02x%02x%02x%02x"
428 "%02x%02x\n", name, out[0], out[1], out[2], out[3], out[4], out[5]); 428 "%02x%02x\n", name, out[0], out[1], out[2], out[3], out[4], out[5]);
429 return;
430} 429}
431 430
432/* Card Read Status (to be used during frame rx) */ 431/* Card Read Status (to be used during frame rx) */
@@ -438,7 +437,6 @@ sb1000_read_status(const int ioaddr[], unsigned char in[])
438 in[3] = inb(ioaddr[0] + 3); 437 in[3] = inb(ioaddr[0] + 3);
439 in[4] = inb(ioaddr[0] + 4); 438 in[4] = inb(ioaddr[0] + 4);
440 in[0] = inb(ioaddr[0] + 5); 439 in[0] = inb(ioaddr[0] + 5);
441 return;
442} 440}
443 441
444/* Issue Read Command (to be used during frame rx) */ 442/* Issue Read Command (to be used during frame rx) */
@@ -450,7 +448,6 @@ sb1000_issue_read_command(const int ioaddr[], const char* name)
450 sb1000_wait_for_ready_clear(ioaddr, name); 448 sb1000_wait_for_ready_clear(ioaddr, name);
451 outb(0xa0, ioaddr[0] + 6); 449 outb(0xa0, ioaddr[0] + 6);
452 sb1000_send_command(ioaddr, name, Command0); 450 sb1000_send_command(ioaddr, name, Command0);
453 return;
454} 451}
455 452
456 453
@@ -733,7 +730,6 @@ sb1000_print_status_buffer(const char* name, unsigned char st[],
733 printk("\n"); 730 printk("\n");
734 } 731 }
735 } 732 }
736 return;
737} 733}
738 734
739/* 735/*
@@ -926,7 +922,6 @@ sb1000_error_dpc(struct net_device *dev)
926 sb1000_read_status(ioaddr, st); 922 sb1000_read_status(ioaddr, st);
927 if (st[1] & 0x10) 923 if (st[1] & 0x10)
928 lp->rx_error_dpc_count = ErrorDpcCounterInitialize; 924 lp->rx_error_dpc_count = ErrorDpcCounterInitialize;
929 return;
930} 925}
931 926
932 927