aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/madgemc.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/tokenring/madgemc.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/tokenring/madgemc.c')
-rw-r--r--drivers/net/tokenring/madgemc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 53f631ebb162..785ad1a2157b 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -109,7 +109,6 @@ static void madgemc_sifwriteb(struct net_device *dev, unsigned short val, unsign
109 SIFWRITEB(val, reg); 109 SIFWRITEB(val, reg);
110 madgemc_setregpage(dev, 0); 110 madgemc_setregpage(dev, 0);
111 } 111 }
112 return;
113} 112}
114 113
115/* 114/*
@@ -140,7 +139,6 @@ static void madgemc_sifwritew(struct net_device *dev, unsigned short val, unsign
140 SIFWRITEW(val, reg); 139 SIFWRITEW(val, reg);
141 madgemc_setregpage(dev, 0); 140 madgemc_setregpage(dev, 0);
142 } 141 }
143 return;
144} 142}
145 143
146static struct net_device_ops madgemc_netdev_ops __read_mostly; 144static struct net_device_ops madgemc_netdev_ops __read_mostly;
@@ -505,8 +503,6 @@ static void madgemc_setregpage(struct net_device *dev, int page)
505 dev->base_addr + MC_CONTROL_REG1); 503 dev->base_addr + MC_CONTROL_REG1);
506 } 504 }
507 reg1 = inb(dev->base_addr + MC_CONTROL_REG1); 505 reg1 = inb(dev->base_addr + MC_CONTROL_REG1);
508
509 return;
510} 506}
511 507
512/* 508/*
@@ -527,8 +523,6 @@ static void madgemc_setsifsel(struct net_device *dev, int val)
527 dev->base_addr + MC_CONTROL_REG0); 523 dev->base_addr + MC_CONTROL_REG0);
528 } 524 }
529 reg0 = inb(dev->base_addr + MC_CONTROL_REG0); 525 reg0 = inb(dev->base_addr + MC_CONTROL_REG0);
530
531 return;
532} 526}
533 527
534/* 528/*
@@ -550,8 +544,6 @@ static void madgemc_setint(struct net_device *dev, int val)
550 outb(reg1 | MC_CONTROL_REG1_SINTEN, 544 outb(reg1 | MC_CONTROL_REG1_SINTEN,
551 dev->base_addr + MC_CONTROL_REG1); 545 dev->base_addr + MC_CONTROL_REG1);
552 } 546 }
553
554 return;
555} 547}
556 548
557/* 549/*
@@ -594,8 +586,6 @@ static void madgemc_chipset_close(struct net_device *dev)
594 madgemc_setint(dev, 0); 586 madgemc_setint(dev, 0);
595 /* unmap SIF registers */ 587 /* unmap SIF registers */
596 madgemc_setsifsel(dev, 0); 588 madgemc_setsifsel(dev, 0);
597
598 return;
599} 589}
600 590
601/* 591/*
@@ -656,8 +646,6 @@ static void madgemc_read_rom(struct net_device *dev, struct card_info *card)
656 /* Restore original register values */ 646 /* Restore original register values */
657 outb(reg0, ioaddr + MC_CONTROL_REG0); 647 outb(reg0, ioaddr + MC_CONTROL_REG0);
658 outb(reg1, ioaddr + MC_CONTROL_REG1); 648 outb(reg1, ioaddr + MC_CONTROL_REG1);
659
660 return;
661} 649}
662 650
663static int madgemc_open(struct net_device *dev) 651static int madgemc_open(struct net_device *dev)