aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--drivers/net/3c501.c1
-rw-r--r--drivers/net/3c503.c2
-rw-r--r--drivers/net/3c507.c1
-rw-r--r--drivers/net/3c509.c1
-rw-r--r--drivers/net/3c515.c2
-rw-r--r--drivers/net/3c59x.c3
-rw-r--r--drivers/net/7990.c1
-rw-r--r--drivers/net/8139cp.c2
-rw-r--r--drivers/net/a2065.c1
-rw-r--r--drivers/net/ac3200.c2
-rw-r--r--drivers/net/acenic.c2
-rw-r--r--drivers/net/apne.c1
-rw-r--r--drivers/net/appletalk/cops.c4
-rw-r--r--drivers/net/appletalk/ltpc.c1
-rw-r--r--drivers/net/at1700.c2
-rw-r--r--drivers/net/atl1c/atl1c_ethtool.c2
-rw-r--r--drivers/net/atl1c/atl1c_main.c2
-rw-r--r--drivers/net/atl1e/atl1e_ethtool.c2
-rw-r--r--drivers/net/atl1e/atl1e_main.c7
-rw-r--r--drivers/net/atlx/atl1.c3
-rw-r--r--drivers/net/atp.c1
-rw-r--r--drivers/net/ax88796.c1
-rw-r--r--drivers/net/benet/be_ethtool.c3
-rw-r--r--drivers/net/benet/be_main.c12
-rw-r--r--drivers/net/bfin_mac.c2
-rw-r--r--drivers/net/bmac.c3
-rw-r--r--drivers/net/can/usb/ems_usb.c4
-rw-r--r--drivers/net/cnic.c3
-rw-r--r--drivers/net/cs89x0.c2
-rw-r--r--drivers/net/cxgb3/l2t.c1
-rw-r--r--drivers/net/declance.c1
-rw-r--r--drivers/net/depca.c6
-rw-r--r--drivers/net/dl2k.c2
-rw-r--r--drivers/net/e1000/e1000_ethtool.c4
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/e1000e/82571.c4
-rw-r--r--drivers/net/e1000e/es2lan.c2
-rw-r--r--drivers/net/e1000e/ich8lan.c10
-rw-r--r--drivers/net/e1000e/netdev.c4
-rw-r--r--drivers/net/e2100.c1
-rw-r--r--drivers/net/eexpress.c1
-rw-r--r--drivers/net/ehea/ehea_main.c4
-rw-r--r--drivers/net/epic100.c4
-rw-r--r--drivers/net/es3210.c2
-rw-r--r--drivers/net/ewrk3.c2
-rw-r--r--drivers/net/gianfar.c4
-rw-r--r--drivers/net/hamachi.c3
-rw-r--r--drivers/net/hamradio/scc.c1
-rw-r--r--drivers/net/hp-plus.c4
-rw-r--r--drivers/net/hp.c3
-rw-r--r--drivers/net/ibmveth.c1
-rw-r--r--drivers/net/igb/e1000_82575.c2
-rw-r--r--drivers/net/igb/igb_main.c3
-rw-r--r--drivers/net/igbvf/ethtool.c2
-rw-r--r--drivers/net/irda/mcs7780.c4
-rw-r--r--drivers/net/irda/smsc-ircc2.c1
-rw-r--r--drivers/net/ixgb/ixgb_ee.c10
-rw-r--r--drivers/net/ixgb/ixgb_hw.c17
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_nl.c1
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c4
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c5
-rw-r--r--drivers/net/ixgbevf/ixgbevf_main.c4
-rw-r--r--drivers/net/jme.c4
-rw-r--r--drivers/net/lib8390.c1
-rw-r--r--drivers/net/lne390.c2
-rw-r--r--drivers/net/mac8390.c2
-rw-r--r--drivers/net/meth.c2
-rw-r--r--drivers/net/mlx4/en_ethtool.c2
-rw-r--r--drivers/net/ne-h8300.c1
-rw-r--r--drivers/net/ne.c1
-rw-r--r--drivers/net/ne2.c1
-rw-r--r--drivers/net/ne2k-pci.c1
-rw-r--r--drivers/net/ne3210.c2
-rw-r--r--drivers/net/netxen/netxen_nic_init.c1
-rw-r--r--drivers/net/netxen/netxen_nic_main.c1
-rw-r--r--drivers/net/ni5010.c2
-rw-r--r--drivers/net/octeon/octeon_mgmt.c1
-rw-r--r--drivers/net/pasemi_mac.c2
-rw-r--r--drivers/net/pcmcia/3c574_cs.c2
-rw-r--r--drivers/net/pcmcia/axnet_cs.c2
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c2
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c2
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c2
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c6
-rw-r--r--drivers/net/pcnet32.c3
-rw-r--r--drivers/net/phy/national.c3
-rw-r--r--drivers/net/plip.c3
-rw-r--r--drivers/net/ps3_gelic_wireless.c1
-rw-r--r--drivers/net/qla3xxx.c6
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c2
-rw-r--r--drivers/net/qlge/qlge_ethtool.c2
-rw-r--r--drivers/net/s2io.c3
-rw-r--r--drivers/net/sb1000.c5
-rw-r--r--drivers/net/seeq8005.c1
-rw-r--r--drivers/net/sis900.c7
-rw-r--r--drivers/net/skfp/skfddi.c2
-rw-r--r--drivers/net/slhc.c1
-rw-r--r--drivers/net/smc-mca.c1
-rw-r--r--drivers/net/smc-ultra.c1
-rw-r--r--drivers/net/smc-ultra32.c1
-rw-r--r--drivers/net/smc9194.c3
-rw-r--r--drivers/net/spider_net.c2
-rw-r--r--drivers/net/starfire.c2
-rw-r--r--drivers/net/stmmac/dwmac1000_core.c8
-rw-r--r--drivers/net/stmmac/dwmac1000_dma.c2
-rw-r--r--drivers/net/stmmac/dwmac100_core.c5
-rw-r--r--drivers/net/stmmac/dwmac100_dma.c4
-rw-r--r--drivers/net/stmmac/dwmac_lib.c12
-rw-r--r--drivers/net/stmmac/enh_desc.c5
-rw-r--r--drivers/net/stmmac/norm_desc.c4
-rw-r--r--drivers/net/stmmac/stmmac_ethtool.c7
-rw-r--r--drivers/net/stmmac/stmmac_main.c22
-rw-r--r--drivers/net/stmmac/stmmac_timer.c6
-rw-r--r--drivers/net/stnic.c1
-rw-r--r--drivers/net/sundance.c5
-rw-r--r--drivers/net/sungem.c1
-rw-r--r--drivers/net/sunhme.c1
-rw-r--r--drivers/net/tokenring/madgemc.c12
-rw-r--r--drivers/net/tokenring/smctr.c2
-rw-r--r--drivers/net/tokenring/tms380tr.c47
-rw-r--r--drivers/net/tulip/de4x5.c68
-rw-r--r--drivers/net/tulip/dmfe.c1
-rw-r--r--drivers/net/tulip/media.c2
-rw-r--r--drivers/net/tulip/winbond-840.c2
-rw-r--r--drivers/net/tun.c1
-rw-r--r--drivers/net/usb/hso.c2
-rw-r--r--drivers/net/vxge/vxge-config.c17
-rw-r--r--drivers/net/vxge/vxge-main.c4
-rw-r--r--drivers/net/vxge/vxge-traffic.c28
-rw-r--r--drivers/net/wd.c1
-rw-r--r--drivers/net/wimax/i2400m/control.c2
-rw-r--r--drivers/net/wimax/i2400m/driver.c2
-rw-r--r--drivers/net/wimax/i2400m/netdev.c2
-rw-r--r--drivers/net/wimax/i2400m/rx.c7
-rw-r--r--drivers/net/wimax/i2400m/sdio-rx.c2
-rw-r--r--drivers/net/wimax/i2400m/usb-notif.c1
-rw-r--r--drivers/net/wireless/at76c50x-usb.c1
-rw-r--r--drivers/net/wireless/ath/ath5k/phy.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/reset.c3
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_calib.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/calib.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom_def.c3
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_txrx.c1
-rw-r--r--drivers/net/wireless/ath/regd.c1
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c1
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c2
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_rx.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945-rs.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-calib.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c1
-rw-r--r--drivers/net/wireless/iwmc3200wifi/sdio.c2
-rw-r--r--drivers/net/wireless/libertas/debugfs.c3
-rw-r--r--drivers/net/wireless/libertas/if_usb.c4
-rw-r--r--drivers/net/wireless/libertas/rx.c1
-rw-r--r--drivers/net/wireless/libertas_tf/if_usb.c1
-rw-r--r--drivers/net/wireless/libertas_tf/main.c1
-rw-r--r--drivers/net/wireless/orinoco/main.c2
-rw-r--r--drivers/net/wireless/p54/p54usb.c1
-rw-r--r--drivers/net/wireless/prism54/isl_ioctl.c2
-rw-r--r--drivers/net/wireless/ray_cs.c5
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00debug.c2
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_rx.c2
-rw-r--r--drivers/net/wireless/wl3501_cs.c2
-rw-r--r--drivers/net/wireless/zd1201.c3
-rw-r--r--drivers/net/yellowfin.c1
-rw-r--r--drivers/net/znet.c1
-rw-r--r--drivers/net/zorro8390.c1
171 files changed, 0 insertions, 631 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 4fed2a88243b..1776ab61b05f 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -726,7 +726,6 @@ static void el_receive(struct net_device *dev)
726 dev->stats.rx_packets++; 726 dev->stats.rx_packets++;
727 dev->stats.rx_bytes += pkt_len; 727 dev->stats.rx_bytes += pkt_len;
728 } 728 }
729 return;
730} 729}
731 730
732/** 731/**
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index b74a0eadbd6c..baac246561b9 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -573,7 +573,6 @@ el2_block_output(struct net_device *dev, int count,
573 } 573 }
574 blocked:; 574 blocked:;
575 outb_p(ei_status.interface_num==0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL); 575 outb_p(ei_status.interface_num==0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL);
576 return;
577} 576}
578 577
579/* Read the 4 byte, page aligned 8390 specific header. */ 578/* Read the 4 byte, page aligned 8390 specific header. */
@@ -689,7 +688,6 @@ el2_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring
689 } 688 }
690 blocked:; 689 blocked:;
691 outb_p(ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL); 690 outb_p(ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL);
692 return;
693} 691}
694 692
695 693
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index c4e272fbc2cc..82eaf65d2d85 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -764,7 +764,6 @@ static void init_82586_mem(struct net_device *dev)
764 if (net_debug > 4) 764 if (net_debug > 4)
765 pr_debug("%s: Initialized 82586, status %04x.\n", dev->name, 765 pr_debug("%s: Initialized 82586, status %04x.\n", dev->name,
766 readw(shmem+iSCB_STATUS)); 766 readw(shmem+iSCB_STATUS));
767 return;
768} 767}
769 768
770static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad) 769static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad)
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 54deaa91e7c6..91abb965fb44 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -1037,7 +1037,6 @@ static void update_stats(struct net_device *dev)
1037 /* Back to window 1, and turn statistics back on. */ 1037 /* Back to window 1, and turn statistics back on. */
1038 EL3WINDOW(1); 1038 EL3WINDOW(1);
1039 outw(StatsEnable, ioaddr + EL3_CMD); 1039 outw(StatsEnable, ioaddr + EL3_CMD);
1040 return;
1041} 1040}
1042 1041
1043static int 1042static int
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index 569e269f282e..3bba835f1a21 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -958,7 +958,6 @@ static void corkscrew_timer(unsigned long data)
958 dev->name, media_tbl[dev->if_port].name); 958 dev->name, media_tbl[dev->if_port].name);
959 959
960#endif /* AUTOMEDIA */ 960#endif /* AUTOMEDIA */
961 return;
962} 961}
963 962
964static void corkscrew_timeout(struct net_device *dev) 963static void corkscrew_timeout(struct net_device *dev)
@@ -1516,7 +1515,6 @@ static void update_stats(int ioaddr, struct net_device *dev)
1516 1515
1517 /* We change back to window 7 (not 1) with the Vortex. */ 1516 /* We change back to window 7 (not 1) with the Vortex. */
1518 EL3WINDOW(7); 1517 EL3WINDOW(7);
1519 return;
1520} 1518}
1521 1519
1522/* This new version of set_rx_mode() supports v1.4 kernels. 1520/* This new version of set_rx_mode() supports v1.4 kernels.
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
1861static void vortex_tx_timeout(struct net_device *dev) 1860static 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
2804static int vortex_nway_reset(struct net_device *dev) 2802static 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. */
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 561d3d582813..903bcb3ef5bd 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -619,7 +619,6 @@ static void lance_load_multicast (struct net_device *dev)
619 crc = crc >> 26; 619 crc = crc >> 26;
620 mcast_table [crc >> 4] |= 1 << (crc & 0xf); 620 mcast_table [crc >> 4] |= 1 << (crc & 0xf);
621 } 621 }
622 return;
623} 622}
624 623
625 624
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index cd63b97f3c68..9c149750e2bf 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1224,8 +1224,6 @@ static void cp_tx_timeout(struct net_device *dev)
1224 netif_wake_queue(dev); 1224 netif_wake_queue(dev);
1225 1225
1226 spin_unlock_irqrestore(&cp->lock, flags); 1226 spin_unlock_irqrestore(&cp->lock, flags);
1227
1228 return;
1229} 1227}
1230 1228
1231#ifdef BROKEN 1229#ifdef BROKEN
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index ecaa28c6f505..541f9a20f519 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -627,7 +627,6 @@ static void lance_load_multicast (struct net_device *dev)
627 crc = crc >> 26; 627 crc = crc >> 26;
628 mcast_table [crc >> 4] |= 1 << (crc & 0xf); 628 mcast_table [crc >> 4] |= 1 << (crc & 0xf);
629 } 629 }
630 return;
631} 630}
632 631
633static void lance_set_multicast (struct net_device *dev) 632static void lance_set_multicast (struct net_device *dev)
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index eac73382c087..b9115a776fdd 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -307,8 +307,6 @@ static void ac_reset_8390(struct net_device *dev)
307 ei_status.txing = 0; 307 ei_status.txing = 0;
308 outb(AC_ENABLE, ioaddr + AC_RESET_PORT); 308 outb(AC_ENABLE, ioaddr + AC_RESET_PORT);
309 if (ei_debug > 1) printk("reset done\n"); 309 if (ei_debug > 1) printk("reset done\n");
310
311 return;
312} 310}
313 311
314/* Grab the 8390 specific header. Similar to the block_input routine, but 312/* Grab the 8390 specific header. Similar to the block_input routine, but
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 1328eb9b841d..b9a591604e5b 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2919,8 +2919,6 @@ static void __devinit ace_clear(struct ace_regs __iomem *regs, u32 dest, int siz
2919 dest += tsize; 2919 dest += tsize;
2920 size -= tsize; 2920 size -= tsize;
2921 } 2921 }
2922
2923 return;
2924} 2922}
2925 2923
2926 2924
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 1437f5d12121..2fe60f168108 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -521,7 +521,6 @@ apne_block_output(struct net_device *dev, int count,
521 521
522 outb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */ 522 outb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */
523 ei_status.dmaing &= ~0x01; 523 ei_status.dmaing &= ~0x01;
524 return;
525} 524}
526 525
527static irqreturn_t apne_interrupt(int irq, void *dev_id) 526static irqreturn_t apne_interrupt(int irq, void *dev_id)
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 14e1d952226e..748c9f526e71 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -593,8 +593,6 @@ static void cops_load (struct net_device *dev)
593 tangent_wait_reset(ioaddr); 593 tangent_wait_reset(ioaddr);
594 inb(ioaddr); /* Clear initial ready signal. */ 594 inb(ioaddr); /* Clear initial ready signal. */
595 } 595 }
596
597 return;
598} 596}
599 597
600/* 598/*
@@ -701,8 +699,6 @@ static void cops_poll(unsigned long ltdev)
701 /* poll 20 times per second */ 699 /* poll 20 times per second */
702 cops_timer.expires = jiffies + HZ/20; 700 cops_timer.expires = jiffies + HZ/20;
703 add_timer(&cops_timer); 701 add_timer(&cops_timer);
704
705 return;
706} 702}
707 703
708/* 704/*
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 6af65b656f31..adc07551739e 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -641,7 +641,6 @@ done:
641 inb_p(base+7); 641 inb_p(base+7);
642 inb_p(base+7); 642 inb_p(base+7);
643 } 643 }
644 return;
645} 644}
646 645
647 646
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 861f07a775fb..93185f5f09ac 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -795,7 +795,6 @@ net_rx(struct net_device *dev)
795 printk("%s: Exint Rx packet with mode %02x after %d ticks.\n", 795 printk("%s: Exint Rx packet with mode %02x after %d ticks.\n",
796 dev->name, inb(ioaddr + RX_MODE), i); 796 dev->name, inb(ioaddr + RX_MODE), i);
797 } 797 }
798 return;
799} 798}
800 799
801/* The inverse routine to net_open(). */ 800/* The inverse routine to net_open(). */
@@ -869,7 +868,6 @@ set_rx_mode(struct net_device *dev)
869 outw(saved_bank, ioaddr + CONFIG_0); 868 outw(saved_bank, ioaddr + CONFIG_0);
870 } 869 }
871 spin_unlock_irqrestore (&lp->lock, flags); 870 spin_unlock_irqrestore (&lp->lock, flags);
872 return;
873} 871}
874 872
875#ifdef MODULE 873#ifdef MODULE
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c
index 32339243d61f..7c521508313c 100644
--- a/drivers/net/atl1c/atl1c_ethtool.c
+++ b/drivers/net/atl1c/atl1c_ethtool.c
@@ -263,8 +263,6 @@ static void atl1c_get_wol(struct net_device *netdev,
263 wol->wolopts |= WAKE_MAGIC; 263 wol->wolopts |= WAKE_MAGIC;
264 if (adapter->wol & AT_WUFC_LNKC) 264 if (adapter->wol & AT_WUFC_LNKC)
265 wol->wolopts |= WAKE_PHY; 265 wol->wolopts |= WAKE_PHY;
266
267 return;
268} 266}
269 267
270static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 268static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 3d7051135c3a..1c3c046d5f34 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -317,8 +317,6 @@ static void atl1c_common_task(struct work_struct *work)
317 317
318 if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) 318 if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE)
319 atl1c_check_link_status(adapter); 319 atl1c_check_link_status(adapter);
320
321 return;
322} 320}
323 321
324 322
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index ffd696ee7c8e..6943a6c3b948 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -338,8 +338,6 @@ static void atl1e_get_wol(struct net_device *netdev,
338 wol->wolopts |= WAKE_MAGIC; 338 wol->wolopts |= WAKE_MAGIC;
339 if (adapter->wol & AT_WUFC_LNKC) 339 if (adapter->wol & AT_WUFC_LNKC)
340 wol->wolopts |= WAKE_PHY; 340 wol->wolopts |= WAKE_PHY;
341
342 return;
343} 341}
344 342
345static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 343static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 7dd33776de00..1acea5774e89 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -707,8 +707,6 @@ static void atl1e_init_ring_resources(struct atl1e_adapter *adapter)
707 adapter->ring_vir_addr = NULL; 707 adapter->ring_vir_addr = NULL;
708 adapter->rx_ring.desc = NULL; 708 adapter->rx_ring.desc = NULL;
709 rwlock_init(&adapter->tx_ring.tx_lock); 709 rwlock_init(&adapter->tx_ring.tx_lock);
710
711 return;
712} 710}
713 711
714/* 712/*
@@ -905,8 +903,6 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
905 AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size); 903 AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size);
906 /* Load all of base address above */ 904 /* Load all of base address above */
907 AT_WRITE_REG(hw, REG_LOAD_PTR, 1); 905 AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
908
909 return;
910} 906}
911 907
912static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) 908static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
@@ -950,7 +946,6 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
950 (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK) 946 (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK)
951 << TXQ_CTRL_NUM_TPD_BURST_SHIFT) 947 << TXQ_CTRL_NUM_TPD_BURST_SHIFT)
952 | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN); 948 | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN);
953 return;
954} 949}
955 950
956static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) 951static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
@@ -1004,7 +999,6 @@ static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
1004 RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN; 999 RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN;
1005 1000
1006 AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data); 1001 AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
1007 return;
1008} 1002}
1009 1003
1010static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) 1004static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
@@ -1024,7 +1018,6 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
1024 << DMA_CTRL_DMAW_DLY_CNT_SHIFT; 1018 << DMA_CTRL_DMAW_DLY_CNT_SHIFT;
1025 1019
1026 AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data); 1020 AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data);
1027 return;
1028} 1021}
1029 1022
1030static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) 1023static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 33448a09b47f..63b9ba0cc67e 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -1830,8 +1830,6 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
1830 adapter->hw_csum_good++; 1830 adapter->hw_csum_good++;
1831 return; 1831 return;
1832 } 1832 }
1833
1834 return;
1835} 1833}
1836 1834
1837/* 1835/*
@@ -3390,7 +3388,6 @@ static void atl1_get_wol(struct net_device *netdev,
3390 wol->wolopts = 0; 3388 wol->wolopts = 0;
3391 if (adapter->wol & ATLX_WUFC_MAG) 3389 if (adapter->wol & ATLX_WUFC_MAG)
3392 wol->wolopts |= WAKE_MAGIC; 3390 wol->wolopts |= WAKE_MAGIC;
3393 return;
3394} 3391}
3395 3392
3396static int atl1_set_wol(struct net_device *netdev, 3393static int atl1_set_wol(struct net_device *netdev,
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 75ff0c59e9c7..bd2f9d331dac 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -802,7 +802,6 @@ static void net_rx(struct net_device *dev)
802 done: 802 done:
803 write_reg(ioaddr, CMR1, CMR1_NextPkt); 803 write_reg(ioaddr, CMR1, CMR1_NextPkt);
804 lp->last_rx_time = jiffies; 804 lp->last_rx_time = jiffies;
805 return;
806} 805}
807 806
808static void read_block(long ioaddr, int length, unsigned char *p, int data_mode) 807static void read_block(long ioaddr, int length, unsigned char *p, int data_mode)
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index b718dc60afc4..55c9958043c4 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -303,7 +303,6 @@ static void ax_block_output(struct net_device *dev, int count,
303 303
304 ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ 304 ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
305 ei_status.dmaing &= ~0x01; 305 ei_status.dmaing &= ~0x01;
306 return;
307} 306}
308 307
309/* definitions for accessing MII/EEPROM interface */ 308/* definitions for accessing MII/EEPROM interface */
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index d488d52d710a..200e98515909 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -276,8 +276,6 @@ be_get_ethtool_stats(struct net_device *netdev,
276 data[i] = (et_stats[i].size == sizeof(u64)) ? 276 data[i] = (et_stats[i].size == sizeof(u64)) ?
277 *(u64 *)p: *(u32 *)p; 277 *(u64 *)p: *(u32 *)p;
278 } 278 }
279
280 return;
281} 279}
282 280
283static void 281static void
@@ -466,7 +464,6 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
466 else 464 else
467 wol->wolopts = 0; 465 wol->wolopts = 0;
468 memset(&wol->sopass, 0, sizeof(wol->sopass)); 466 memset(&wol->sopass, 0, sizeof(wol->sopass));
469 return;
470} 467}
471 468
472static int 469static int
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index fa10f13242c3..058d7f95f5ae 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -830,7 +830,6 @@ static void skb_fill_rx_data(struct be_adapter *adapter,
830 830
831done: 831done:
832 be_rx_stats_update(adapter, pktsize, num_rcvd); 832 be_rx_stats_update(adapter, pktsize, num_rcvd);
833 return;
834} 833}
835 834
836/* Process the RX completion indicated by rxcp when GRO is disabled */ 835/* Process the RX completion indicated by rxcp when GRO is disabled */
@@ -884,8 +883,6 @@ static void be_rx_compl_process(struct be_adapter *adapter,
884 } else { 883 } else {
885 netif_receive_skb(skb); 884 netif_receive_skb(skb);
886 } 885 }
887
888 return;
889} 886}
890 887
891/* Process the RX completion indicated by rxcp when GRO is enabled */ 888/* Process the RX completion indicated by rxcp when GRO is enabled */
@@ -965,7 +962,6 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
965 } 962 }
966 963
967 be_rx_stats_update(adapter, pkt_size, num_rcvd); 964 be_rx_stats_update(adapter, pkt_size, num_rcvd);
968 return;
969} 965}
970 966
971static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter) 967static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter)
@@ -1059,8 +1055,6 @@ static void be_post_rx_frags(struct be_adapter *adapter)
1059 /* Let be_worker replenish when memory is available */ 1055 /* Let be_worker replenish when memory is available */
1060 adapter->rx_post_starved = true; 1056 adapter->rx_post_starved = true;
1061 } 1057 }
1062
1063 return;
1064} 1058}
1065 1059
1066static struct be_eth_tx_compl *be_tx_compl_get(struct be_queue_info *tx_cq) 1060static struct be_eth_tx_compl *be_tx_compl_get(struct be_queue_info *tx_cq)
@@ -1622,7 +1616,6 @@ static void be_msix_enable(struct be_adapter *adapter)
1622 BE_NUM_MSIX_VECTORS); 1616 BE_NUM_MSIX_VECTORS);
1623 if (status == 0) 1617 if (status == 0)
1624 adapter->msix_enabled = true; 1618 adapter->msix_enabled = true;
1625 return;
1626} 1619}
1627 1620
1628static void be_sriov_enable(struct be_adapter *adapter) 1621static void be_sriov_enable(struct be_adapter *adapter)
@@ -1634,7 +1627,6 @@ static void be_sriov_enable(struct be_adapter *adapter)
1634 adapter->sriov_enabled = status ? false : true; 1627 adapter->sriov_enabled = status ? false : true;
1635 } 1628 }
1636#endif 1629#endif
1637 return;
1638} 1630}
1639 1631
1640static void be_sriov_disable(struct be_adapter *adapter) 1632static void be_sriov_disable(struct be_adapter *adapter)
@@ -1741,7 +1733,6 @@ static void be_irq_unregister(struct be_adapter *adapter)
1741 be_free_irq(adapter, &adapter->rx_eq); 1733 be_free_irq(adapter, &adapter->rx_eq);
1742done: 1734done:
1743 adapter->isr_registered = false; 1735 adapter->isr_registered = false;
1744 return;
1745} 1736}
1746 1737
1747static int be_open(struct net_device *netdev) 1738static int be_open(struct net_device *netdev)
@@ -2620,8 +2611,6 @@ static void be_shutdown(struct pci_dev *pdev)
2620 be_setup_wol(adapter, true); 2611 be_setup_wol(adapter, true);
2621 2612
2622 pci_disable_device(pdev); 2613 pci_disable_device(pdev);
2623
2624 return;
2625} 2614}
2626 2615
2627static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev, 2616static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
@@ -2703,7 +2692,6 @@ static void be_eeh_resume(struct pci_dev *pdev)
2703 return; 2692 return;
2704err: 2693err:
2705 dev_err(&adapter->pdev->dev, "EEH resume failed\n"); 2694 dev_err(&adapter->pdev->dev, "EEH resume failed\n");
2706 return;
2707} 2695}
2708 2696
2709static struct pci_error_handlers be_eeh_handlers = { 2697static struct pci_error_handlers be_eeh_handlers = {
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index b0207f01eb6b..35548701899f 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -835,8 +835,6 @@ static void bfin_mac_multicast_hash(struct net_device *dev)
835 835
836 bfin_write_EMAC_HASHHI(emac_hashhi); 836 bfin_write_EMAC_HASHHI(emac_hashhi);
837 bfin_write_EMAC_HASHLO(emac_hashlo); 837 bfin_write_EMAC_HASHLO(emac_hashlo);
838
839 return;
840} 838}
841 839
842/* 840/*
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 44ceecf9d103..39250b2ca886 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -167,7 +167,6 @@ static inline void
167dbdma_st32(volatile __u32 __iomem *a, unsigned long x) 167dbdma_st32(volatile __u32 __iomem *a, unsigned long x)
168{ 168{
169 __asm__ volatile( "stwbrx %0,0,%1" : : "r" (x), "r" (a) : "memory"); 169 __asm__ volatile( "stwbrx %0,0,%1" : : "r" (x), "r" (a) : "memory");
170 return;
171} 170}
172 171
173static inline unsigned long 172static inline unsigned long
@@ -382,8 +381,6 @@ bmac_init_registers(struct net_device *dev)
382 bmwrite(dev, RXCFG, RxCRCNoStrip | RxHashFilterEnable | RxRejectOwnPackets); 381 bmwrite(dev, RXCFG, RxCRCNoStrip | RxHashFilterEnable | RxRejectOwnPackets);
383 382
384 bmwrite(dev, INTDISABLE, EnableNormal); 383 bmwrite(dev, INTDISABLE, EnableNormal);
385
386 return;
387} 384}
388 385
389#if 0 386#if 0
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index d800b598ae3d..df0a6369d2f2 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -300,8 +300,6 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
300 else if (err) 300 else if (err)
301 dev_err(netdev->dev.parent, 301 dev_err(netdev->dev.parent,
302 "failed resubmitting intr urb: %d\n", err); 302 "failed resubmitting intr urb: %d\n", err);
303
304 return;
305} 303}
306 304
307static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg) 305static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
@@ -497,8 +495,6 @@ resubmit_urb:
497 else if (retval) 495 else if (retval)
498 dev_err(netdev->dev.parent, 496 dev_err(netdev->dev.parent,
499 "failed resubmitting read bulk urb: %d\n", retval); 497 "failed resubmitting read bulk urb: %d\n", retval);
500
501 return;
502} 498}
503 499
504/* 500/*
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4b451a7c03e9..4b08b18ca5d6 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -2092,7 +2092,6 @@ end:
2092 i += j; 2092 i += j;
2093 j = 1; 2093 j = 1;
2094 } 2094 }
2095 return;
2096} 2095}
2097 2096
2098static u16 cnic_bnx2_next_idx(u16 idx) 2097static u16 cnic_bnx2_next_idx(u16 idx)
@@ -2325,7 +2324,6 @@ done:
2325 status_idx, IGU_INT_ENABLE, 1); 2324 status_idx, IGU_INT_ENABLE, 1);
2326 2325
2327 cp->kcq_prod_idx = sw_prod; 2326 cp->kcq_prod_idx = sw_prod;
2328 return;
2329} 2327}
2330 2328
2331static int cnic_service_bnx2x(void *data, void *status_blk) 2329static int cnic_service_bnx2x(void *data, void *status_blk)
@@ -4628,7 +4626,6 @@ static void __exit cnic_exit(void)
4628{ 4626{
4629 unregister_netdevice_notifier(&cnic_netdev_notifier); 4627 unregister_netdevice_notifier(&cnic_netdev_notifier);
4630 cnic_release(); 4628 cnic_release();
4631 return;
4632} 4629}
4633 4630
4634module_init(cnic_init); 4631module_init(cnic_init);
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 2281ebcb400b..2ccb9f12805b 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -902,7 +902,6 @@ get_dma_channel(struct net_device *dev)
902 return; 902 return;
903 } 903 }
904 } 904 }
905 return;
906} 905}
907 906
908static void 907static void
@@ -1672,7 +1671,6 @@ count_rx_errors(int status, struct net_local *lp)
1672 /* per str 172 */ 1671 /* per str 172 */
1673 lp->stats.rx_crc_errors++; 1672 lp->stats.rx_crc_errors++;
1674 if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++; 1673 if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++;
1675 return;
1676} 1674}
1677 1675
1678/* We have a good packet(s), get it/them out of the buffers. */ 1676/* We have a good packet(s), get it/them out of the buffers. */
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index 2f3ee721c3e1..f452c4003253 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -207,7 +207,6 @@ again:
207 */ 207 */
208 neigh_event_send(e->neigh, NULL); 208 neigh_event_send(e->neigh, NULL);
209 } 209 }
210 return;
211} 210}
212 211
213EXPORT_SYMBOL(t3_l2t_send_event); 212EXPORT_SYMBOL(t3_l2t_send_event);
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 74abe195212c..1d973db27c32 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -969,7 +969,6 @@ static void lance_load_multicast(struct net_device *dev)
969 crc = crc >> 26; 969 crc = crc >> 26;
970 *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf); 970 *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf);
971 } 971 }
972 return;
973} 972}
974 973
975static void lance_set_multicast(struct net_device *dev) 974static void lance_set_multicast(struct net_device *dev)
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 38d4d9eefbdd..bf66e9b3b19e 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1203,8 +1203,6 @@ static void LoadCSRs(struct net_device *dev)
1203 outw(ACON, DEPCA_DATA); 1203 outw(ACON, DEPCA_DATA);
1204 1204
1205 outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */ 1205 outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */
1206
1207 return;
1208} 1206}
1209 1207
1210static int InitRestartDepca(struct net_device *dev) 1208static int InitRestartDepca(struct net_device *dev)
@@ -1302,8 +1300,6 @@ static void SetMulticastFilter(struct net_device *dev)
1302 } 1300 }
1303 } 1301 }
1304 } 1302 }
1305
1306 return;
1307} 1303}
1308 1304
1309static int __init depca_common_init (u_long ioaddr, struct net_device **devp) 1305static int __init depca_common_init (u_long ioaddr, struct net_device **devp)
@@ -1908,8 +1904,6 @@ static void depca_dbg_open(struct net_device *dev)
1908 outw(CSR3, DEPCA_ADDR); 1904 outw(CSR3, DEPCA_ADDR);
1909 printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA)); 1905 printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA));
1910 } 1906 }
1911
1912 return;
1913} 1907}
1914 1908
1915/* 1909/*
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 6579225dbd91..a2f238d20caa 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -596,8 +596,6 @@ alloc_list (struct net_device *dev)
596 /* Set RFDListPtr */ 596 /* Set RFDListPtr */
597 writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0); 597 writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0);
598 writel (0, dev->base_addr + RFDListPtr1); 598 writel (0, dev->base_addr + RFDListPtr1);
599
600 return;
601} 599}
602 600
603static netdev_tx_t 601static netdev_tx_t
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 2a3b2dccd06d..d5ff029aa7b2 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1015,8 +1015,6 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
1015 txdr->buffer_info = NULL; 1015 txdr->buffer_info = NULL;
1016 kfree(rxdr->buffer_info); 1016 kfree(rxdr->buffer_info);
1017 rxdr->buffer_info = NULL; 1017 rxdr->buffer_info = NULL;
1018
1019 return;
1020} 1018}
1021 1019
1022static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 1020static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
@@ -1711,8 +1709,6 @@ static void e1000_get_wol(struct net_device *netdev,
1711 wol->wolopts |= WAKE_BCAST; 1709 wol->wolopts |= WAKE_BCAST;
1712 if (adapter->wol & E1000_WUFC_MAG) 1710 if (adapter->wol & E1000_WUFC_MAG)
1713 wol->wolopts |= WAKE_MAGIC; 1711 wol->wolopts |= WAKE_MAGIC;
1714
1715 return;
1716} 1712}
1717 1713
1718static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 1714static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4dd2c23775cb..f06c8975f886 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2546,8 +2546,6 @@ set_itr_now:
2546 adapter->itr = new_itr; 2546 adapter->itr = new_itr;
2547 ew32(ITR, 1000000000 / (new_itr * 256)); 2547 ew32(ITR, 1000000000 / (new_itr * 256));
2548 } 2548 }
2549
2550 return;
2551} 2549}
2552 2550
2553#define E1000_TX_FLAGS_CSUM 0x00000001 2551#define E1000_TX_FLAGS_CSUM 0x00000001
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 8bad24da2289..f654db9121de 100644
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1148,8 +1148,6 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
1148 default: 1148 default:
1149 break; 1149 break;
1150 } 1150 }
1151
1152 return;
1153} 1151}
1154 1152
1155/** 1153/**
@@ -1653,8 +1651,6 @@ static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)
1653 /* If the management interface is not enabled, then power down */ 1651 /* If the management interface is not enabled, then power down */
1654 if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw))) 1652 if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw)))
1655 e1000_power_down_phy_copper(hw); 1653 e1000_power_down_phy_copper(hw);
1656
1657 return;
1658} 1654}
1659 1655
1660/** 1656/**
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index 7fcac7827865..38d79a669059 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -1383,8 +1383,6 @@ static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw)
1383 if (!(hw->mac.ops.check_mng_mode(hw) || 1383 if (!(hw->mac.ops.check_mng_mode(hw) ||
1384 hw->phy.ops.check_reset_block(hw))) 1384 hw->phy.ops.check_reset_block(hw)))
1385 e1000_power_down_phy_copper(hw); 1385 e1000_power_down_phy_copper(hw);
1386
1387 return;
1388} 1386}
1389 1387
1390/** 1388/**
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 10360fb596aa..b2507d93de99 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -690,8 +690,6 @@ static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw)
690static void e1000_release_nvm_ich8lan(struct e1000_hw *hw) 690static void e1000_release_nvm_ich8lan(struct e1000_hw *hw)
691{ 691{
692 mutex_unlock(&nvm_mutex); 692 mutex_unlock(&nvm_mutex);
693
694 return;
695} 693}
696 694
697static DEFINE_MUTEX(swflag_mutex); 695static DEFINE_MUTEX(swflag_mutex);
@@ -770,8 +768,6 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
770 ew32(EXTCNF_CTRL, extcnf_ctrl); 768 ew32(EXTCNF_CTRL, extcnf_ctrl);
771 769
772 mutex_unlock(&swflag_mutex); 770 mutex_unlock(&swflag_mutex);
773
774 return;
775} 771}
776 772
777/** 773/**
@@ -2756,8 +2752,6 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
2756 reg = er32(RFCTL); 2752 reg = er32(RFCTL);
2757 reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS); 2753 reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
2758 ew32(RFCTL, reg); 2754 ew32(RFCTL, reg);
2759
2760 return;
2761} 2755}
2762 2756
2763/** 2757/**
@@ -3137,8 +3131,6 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
3137 default: 3131 default:
3138 break; 3132 break;
3139 } 3133 }
3140
3141 return;
3142} 3134}
3143 3135
3144/** 3136/**
@@ -3347,8 +3339,6 @@ static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw)
3347 if (!(hw->mac.ops.check_mng_mode(hw) || 3339 if (!(hw->mac.ops.check_mng_mode(hw) ||
3348 hw->phy.ops.check_reset_block(hw))) 3340 hw->phy.ops.check_reset_block(hw)))
3349 e1000_power_down_phy_copper(hw); 3341 e1000_power_down_phy_copper(hw);
3350
3351 return;
3352} 3342}
3353 3343
3354/** 3344/**
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 1ad29d992417..f5081cf898aa 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1767,8 +1767,6 @@ void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
1767 pci_disable_msi(adapter->pdev); 1767 pci_disable_msi(adapter->pdev);
1768 adapter->flags &= ~FLAG_MSI_ENABLED; 1768 adapter->flags &= ~FLAG_MSI_ENABLED;
1769 } 1769 }
1770
1771 return;
1772} 1770}
1773 1771
1774/** 1772/**
@@ -1820,8 +1818,6 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
1820 /* Don't do anything; this is the system default */ 1818 /* Don't do anything; this is the system default */
1821 break; 1819 break;
1822 } 1820 }
1823
1824 return;
1825} 1821}
1826 1822
1827/** 1823/**
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index ca93c9a9d372..06e72fbef862 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -328,7 +328,6 @@ e21_reset_8390(struct net_device *dev)
328 /* Set up the ASIC registers, just in case something changed them. */ 328 /* Set up the ASIC registers, just in case something changed them. */
329 329
330 if (ei_debug > 1) printk("reset done\n"); 330 if (ei_debug > 1) printk("reset done\n");
331 return;
332} 331}
333 332
334/* Grab the 8390 specific header. We put the 2k window so the header page 333/* Grab the 8390 specific header. We put the 2k window so the header page
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 43c9c9c5cf4c..12c37d264108 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1570,7 +1570,6 @@ static void eexp_hw_init586(struct net_device *dev)
1570#if NET_DEBUG > 6 1570#if NET_DEBUG > 6
1571 printk("%s: leaving eexp_hw_init586()\n", dev->name); 1571 printk("%s: leaving eexp_hw_init586()\n", dev->name);
1572#endif 1572#endif
1573 return;
1574} 1573}
1575 1574
1576static void eexp_setup_filter(struct net_device *dev) 1575static void eexp_setup_filter(struct net_device *dev)
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 33a41e29ec83..e8a8ccfedac6 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1881,7 +1881,6 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
1881 port->promisc = enable; 1881 port->promisc = enable;
1882out: 1882out:
1883 free_page((unsigned long)cb7); 1883 free_page((unsigned long)cb7);
1884 return;
1885} 1884}
1886 1885
1887static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr, 1886static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr,
@@ -2025,7 +2024,6 @@ static void ehea_set_multicast_list(struct net_device *dev)
2025 } 2024 }
2026out: 2025out:
2027 ehea_update_bcmc_registrations(); 2026 ehea_update_bcmc_registrations();
2028 return;
2029} 2027}
2030 2028
2031static int ehea_change_mtu(struct net_device *dev, int new_mtu) 2029static int ehea_change_mtu(struct net_device *dev, int new_mtu)
@@ -2338,7 +2336,6 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
2338 ehea_error("modify_ehea_port failed"); 2336 ehea_error("modify_ehea_port failed");
2339out: 2337out:
2340 free_page((unsigned long)cb1); 2338 free_page((unsigned long)cb1);
2341 return;
2342} 2339}
2343 2340
2344int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp) 2341int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
@@ -2881,7 +2878,6 @@ static void ehea_reset_port(struct work_struct *work)
2881 netif_wake_queue(dev); 2878 netif_wake_queue(dev);
2882out: 2879out:
2883 mutex_unlock(&port->port_lock); 2880 mutex_unlock(&port->port_lock);
2884 return;
2885} 2881}
2886 2882
2887static void ehea_rereg_mrs(struct work_struct *work) 2883static void ehea_rereg_mrs(struct work_struct *work)
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index a48da2dc907f..6838dfc9ef23 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -652,7 +652,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
652 if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0) 652 if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0)
653 break; 653 break;
654 } 654 }
655 return;
656} 655}
657 656
658 657
@@ -840,7 +839,6 @@ static void epic_restart(struct net_device *dev)
840 " interrupt %4.4x.\n", 839 " interrupt %4.4x.\n",
841 dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL), 840 dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL),
842 (int)inl(ioaddr + INTSTAT)); 841 (int)inl(ioaddr + INTSTAT));
843 return;
844} 842}
845 843
846static void check_media(struct net_device *dev) 844static void check_media(struct net_device *dev)
@@ -958,7 +956,6 @@ static void epic_init_ring(struct net_device *dev)
958 (i+1)*sizeof(struct epic_tx_desc); 956 (i+1)*sizeof(struct epic_tx_desc);
959 } 957 }
960 ep->tx_ring[i-1].next = ep->tx_ring_dma; 958 ep->tx_ring[i-1].next = ep->tx_ring_dma;
961 return;
962} 959}
963 960
964static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) 961static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -1413,7 +1410,6 @@ static void set_rx_mode(struct net_device *dev)
1413 outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4); 1410 outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4);
1414 memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter)); 1411 memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter));
1415 } 1412 }
1416 return;
1417} 1413}
1418 1414
1419static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) 1415static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 5569f2ffb62c..0ba5e7b90584 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -319,8 +319,6 @@ static void es_reset_8390(struct net_device *dev)
319 ei_status.txing = 0; 319 ei_status.txing = 0;
320 outb(0x01, ioaddr + ES_RESET_PORT); 320 outb(0x01, ioaddr + ES_RESET_PORT);
321 if (ei_debug > 1) printk("reset done\n"); 321 if (ei_debug > 1) printk("reset done\n");
322
323 return;
324} 322}
325 323
326/* 324/*
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index 99eb56be093f..380d0614a89a 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -1369,8 +1369,6 @@ static void __init EthwrkSignature(char *name, char *eeprom_image)
1369 name[EWRK3_STRLEN] = '\0'; 1369 name[EWRK3_STRLEN] = '\0';
1370 } else 1370 } else
1371 name[0] = '\0'; 1371 name[0] = '\0';
1372
1373 return;
1374} 1372}
1375 1373
1376/* 1374/*
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index ea7d5ddb7760..43db5ab8ba3d 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -3009,8 +3009,6 @@ static void gfar_set_multi(struct net_device *dev)
3009 gfar_set_hash_for_addr(dev, ha->addr); 3009 gfar_set_hash_for_addr(dev, ha->addr);
3010 } 3010 }
3011 } 3011 }
3012
3013 return;
3014} 3012}
3015 3013
3016 3014
@@ -3051,8 +3049,6 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
3051 tempval = gfar_read(priv->hash_regs[whichreg]); 3049 tempval = gfar_read(priv->hash_regs[whichreg]);
3052 tempval |= value; 3050 tempval |= value;
3053 gfar_write(priv->hash_regs[whichreg], tempval); 3051 gfar_write(priv->hash_regs[whichreg], tempval);
3054
3055 return;
3056} 3052}
3057 3053
3058 3054
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 83f43bb835d6..61f2b1cfcd46 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -859,7 +859,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
859 for (i = 10000; i >= 0; i--) 859 for (i = 10000; i >= 0; i--)
860 if ((readw(ioaddr + MII_Status) & 1) == 0) 860 if ((readw(ioaddr + MII_Status) & 1) == 0)
861 break; 861 break;
862 return;
863} 862}
864 863
865 864
@@ -1225,8 +1224,6 @@ static void hamachi_init_ring(struct net_device *dev)
1225 } 1224 }
1226 /* Mark the last entry of the ring */ 1225 /* Mark the last entry of the ring */
1227 hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing); 1226 hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing);
1228
1229 return;
1230} 1227}
1231 1228
1232 1229
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index f3a96b843911..9f64c8637208 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1629,7 +1629,6 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
1629 skb->protocol = ax25_type_trans(skb, scc->dev); 1629 skb->protocol = ax25_type_trans(skb, scc->dev);
1630 1630
1631 netif_rx(skb); 1631 netif_rx(skb);
1632 return;
1633} 1632}
1634 1633
1635/* ----> transmit frame <---- */ 1634/* ----> transmit frame <---- */
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
428static void 426static 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
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
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 092fb9d76693..3e4dead5a2f4 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1421,7 +1421,6 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
1421 if (!entry) 1421 if (!entry)
1422 ibmveth_error_printk("Cannot create adapter proc entry"); 1422 ibmveth_error_printk("Cannot create adapter proc entry");
1423 } 1423 }
1424 return;
1425} 1424}
1426 1425
1427static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter) 1426static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 3ef495537dc5..86438b59fa21 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -1214,8 +1214,6 @@ void igb_power_down_phy_copper_82575(struct e1000_hw *hw)
1214 /* If the management interface is not enabled, then power down */ 1214 /* If the management interface is not enabled, then power down */
1215 if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw))) 1215 if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw)))
1216 igb_power_down_phy_copper(hw); 1216 igb_power_down_phy_copper(hw);
1217
1218 return;
1219} 1217}
1220 1218
1221/** 1219/**
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 589cf4a6427a..3881918f5382 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1054,7 +1054,6 @@ msi_only:
1054out: 1054out:
1055 /* Notify the stack of the (possibly) reduced Tx Queue count. */ 1055 /* Notify the stack of the (possibly) reduced Tx Queue count. */
1056 adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; 1056 adapter->netdev->real_num_tx_queues = adapter->num_tx_queues;
1057 return;
1058} 1057}
1059 1058
1060/** 1059/**
@@ -3717,8 +3716,6 @@ set_itr_now:
3717 q_vector->itr_val = new_itr; 3716 q_vector->itr_val = new_itr;
3718 q_vector->set_itr = 1; 3717 q_vector->set_itr = 1;
3719 } 3718 }
3720
3721 return;
3722} 3719}
3723 3720
3724#define IGB_TX_FLAGS_CSUM 0x00000001 3721#define IGB_TX_FLAGS_CSUM 0x00000001
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index 8afff07ff559..103b3aa1afc2 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -390,8 +390,6 @@ static void igbvf_get_wol(struct net_device *netdev,
390{ 390{
391 wol->supported = 0; 391 wol->supported = 0;
392 wol->wolopts = 0; 392 wol->wolopts = 0;
393
394 return;
395} 393}
396 394
397static int igbvf_set_wol(struct net_device *netdev, 395static int igbvf_set_wol(struct net_device *netdev,
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index c0e0bb9401d3..5b1036ac38d7 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -434,8 +434,6 @@ static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len)
434 434
435 mcs->netdev->stats.rx_packets++; 435 mcs->netdev->stats.rx_packets++;
436 mcs->netdev->stats.rx_bytes += new_len; 436 mcs->netdev->stats.rx_bytes += new_len;
437
438 return;
439} 437}
440 438
441/* Unwrap received packets at FIR speed. A 32 bit crc_ccitt checksum is 439/* Unwrap received packets at FIR speed. A 32 bit crc_ccitt checksum is
@@ -487,8 +485,6 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
487 485
488 mcs->netdev->stats.rx_packets++; 486 mcs->netdev->stats.rx_packets++;
489 mcs->netdev->stats.rx_bytes += new_len; 487 mcs->netdev->stats.rx_bytes += new_len;
490
491 return;
492} 488}
493 489
494 490
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 35e4e44040a2..d67e48418e55 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -2822,7 +2822,6 @@ static void __init preconfigure_ali_port(struct pci_dev *dev,
2822 tmpbyte |= mask; 2822 tmpbyte |= mask;
2823 pci_write_config_byte(dev, reg, tmpbyte); 2823 pci_write_config_byte(dev, reg, tmpbyte);
2824 IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port); 2824 IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port);
2825 return;
2826} 2825}
2827 2826
2828static int __init preconfigure_through_ali(struct pci_dev *dev, 2827static int __init preconfigure_through_ali(struct pci_dev *dev,
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 06303a36aaf7..813993f9c65c 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -58,7 +58,6 @@ ixgb_raise_clock(struct ixgb_hw *hw,
58 *eecd_reg = *eecd_reg | IXGB_EECD_SK; 58 *eecd_reg = *eecd_reg | IXGB_EECD_SK;
59 IXGB_WRITE_REG(hw, EECD, *eecd_reg); 59 IXGB_WRITE_REG(hw, EECD, *eecd_reg);
60 udelay(50); 60 udelay(50);
61 return;
62} 61}
63 62
64/****************************************************************************** 63/******************************************************************************
@@ -77,7 +76,6 @@ ixgb_lower_clock(struct ixgb_hw *hw,
77 *eecd_reg = *eecd_reg & ~IXGB_EECD_SK; 76 *eecd_reg = *eecd_reg & ~IXGB_EECD_SK;
78 IXGB_WRITE_REG(hw, EECD, *eecd_reg); 77 IXGB_WRITE_REG(hw, EECD, *eecd_reg);
79 udelay(50); 78 udelay(50);
80 return;
81} 79}
82 80
83/****************************************************************************** 81/******************************************************************************
@@ -127,7 +125,6 @@ ixgb_shift_out_bits(struct ixgb_hw *hw,
127 /* We leave the "DI" bit set to "0" when we leave this routine. */ 125 /* We leave the "DI" bit set to "0" when we leave this routine. */
128 eecd_reg &= ~IXGB_EECD_DI; 126 eecd_reg &= ~IXGB_EECD_DI;
129 IXGB_WRITE_REG(hw, EECD, eecd_reg); 127 IXGB_WRITE_REG(hw, EECD, eecd_reg);
130 return;
131} 128}
132 129
133/****************************************************************************** 130/******************************************************************************
@@ -192,7 +189,6 @@ ixgb_setup_eeprom(struct ixgb_hw *hw)
192 /* Set CS */ 189 /* Set CS */
193 eecd_reg |= IXGB_EECD_CS; 190 eecd_reg |= IXGB_EECD_CS;
194 IXGB_WRITE_REG(hw, EECD, eecd_reg); 191 IXGB_WRITE_REG(hw, EECD, eecd_reg);
195 return;
196} 192}
197 193
198/****************************************************************************** 194/******************************************************************************
@@ -226,7 +222,6 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
226 eecd_reg &= ~IXGB_EECD_SK; 222 eecd_reg &= ~IXGB_EECD_SK;
227 IXGB_WRITE_REG(hw, EECD, eecd_reg); 223 IXGB_WRITE_REG(hw, EECD, eecd_reg);
228 udelay(50); 224 udelay(50);
229 return;
230} 225}
231 226
232/****************************************************************************** 227/******************************************************************************
@@ -250,7 +245,6 @@ ixgb_clock_eeprom(struct ixgb_hw *hw)
250 eecd_reg &= ~IXGB_EECD_SK; 245 eecd_reg &= ~IXGB_EECD_SK;
251 IXGB_WRITE_REG(hw, EECD, eecd_reg); 246 IXGB_WRITE_REG(hw, EECD, eecd_reg);
252 udelay(50); 247 udelay(50);
253 return;
254} 248}
255 249
256/****************************************************************************** 250/******************************************************************************
@@ -270,7 +264,6 @@ ixgb_cleanup_eeprom(struct ixgb_hw *hw)
270 IXGB_WRITE_REG(hw, EECD, eecd_reg); 264 IXGB_WRITE_REG(hw, EECD, eecd_reg);
271 265
272 ixgb_clock_eeprom(hw); 266 ixgb_clock_eeprom(hw);
273 return;
274} 267}
275 268
276/****************************************************************************** 269/******************************************************************************
@@ -359,7 +352,6 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
359 checksum = (u16) EEPROM_SUM - checksum; 352 checksum = (u16) EEPROM_SUM - checksum;
360 353
361 ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum); 354 ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
362 return;
363} 355}
364 356
365/****************************************************************************** 357/******************************************************************************
@@ -414,8 +406,6 @@ ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
414 406
415 /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */ 407 /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */
416 ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR); 408 ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
417
418 return;
419} 409}
420 410
421/****************************************************************************** 411/******************************************************************************
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index cd247b8d2b73..397acabccab6 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -413,8 +413,6 @@ ixgb_init_rx_addrs(struct ixgb_hw *hw)
413 IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); 413 IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
414 IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); 414 IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
415 } 415 }
416
417 return;
418} 416}
419 417
420/****************************************************************************** 418/******************************************************************************
@@ -483,7 +481,6 @@ ixgb_mc_addr_list_update(struct ixgb_hw *hw,
483 } 481 }
484 482
485 pr_debug("MC Update Complete\n"); 483 pr_debug("MC Update Complete\n");
486 return;
487} 484}
488 485
489/****************************************************************************** 486/******************************************************************************
@@ -566,8 +563,6 @@ ixgb_mta_set(struct ixgb_hw *hw,
566 mta_reg |= (1 << hash_bit); 563 mta_reg |= (1 << hash_bit);
567 564
568 IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg); 565 IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg);
569
570 return;
571} 566}
572 567
573/****************************************************************************** 568/******************************************************************************
@@ -600,7 +595,6 @@ ixgb_rar_set(struct ixgb_hw *hw,
600 595
601 IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low); 596 IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
602 IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high); 597 IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
603 return;
604} 598}
605 599
606/****************************************************************************** 600/******************************************************************************
@@ -616,7 +610,6 @@ ixgb_write_vfta(struct ixgb_hw *hw,
616 u32 value) 610 u32 value)
617{ 611{
618 IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value); 612 IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
619 return;
620} 613}
621 614
622/****************************************************************************** 615/******************************************************************************
@@ -631,7 +624,6 @@ ixgb_clear_vfta(struct ixgb_hw *hw)
631 624
632 for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++) 625 for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
633 IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0); 626 IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
634 return;
635} 627}
636 628
637/****************************************************************************** 629/******************************************************************************
@@ -1050,7 +1042,6 @@ ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
1050 temp_reg = IXGB_READ_REG(hw, XOFFRXC); 1042 temp_reg = IXGB_READ_REG(hw, XOFFRXC);
1051 temp_reg = IXGB_READ_REG(hw, XOFFTXC); 1043 temp_reg = IXGB_READ_REG(hw, XOFFTXC);
1052 temp_reg = IXGB_READ_REG(hw, RJC); 1044 temp_reg = IXGB_READ_REG(hw, RJC);
1053 return;
1054} 1045}
1055 1046
1056/****************************************************************************** 1047/******************************************************************************
@@ -1066,7 +1057,6 @@ ixgb_led_on(struct ixgb_hw *hw)
1066 /* To turn on the LED, clear software-definable pin 0 (SDP0). */ 1057 /* To turn on the LED, clear software-definable pin 0 (SDP0). */
1067 ctrl0_reg &= ~IXGB_CTRL0_SDP0; 1058 ctrl0_reg &= ~IXGB_CTRL0_SDP0;
1068 IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg); 1059 IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
1069 return;
1070} 1060}
1071 1061
1072/****************************************************************************** 1062/******************************************************************************
@@ -1082,7 +1072,6 @@ ixgb_led_off(struct ixgb_hw *hw)
1082 /* To turn off the LED, set software-definable pin 0 (SDP0). */ 1072 /* To turn off the LED, set software-definable pin 0 (SDP0). */
1083 ctrl0_reg |= IXGB_CTRL0_SDP0; 1073 ctrl0_reg |= IXGB_CTRL0_SDP0;
1084 IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg); 1074 IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
1085 return;
1086} 1075}
1087 1076
1088/****************************************************************************** 1077/******************************************************************************
@@ -1122,8 +1111,6 @@ ixgb_get_bus_info(struct ixgb_hw *hw)
1122 1111
1123 hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ? 1112 hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ?
1124 ixgb_bus_width_64 : ixgb_bus_width_32; 1113 ixgb_bus_width_64 : ixgb_bus_width_32;
1125
1126 return;
1127} 1114}
1128 1115
1129/****************************************************************************** 1116/******************************************************************************
@@ -1210,8 +1197,6 @@ ixgb_optics_reset(struct ixgb_hw *hw)
1210 IXGB_PHY_ADDRESS, 1197 IXGB_PHY_ADDRESS,
1211 MDIO_MMD_PMAPMD); 1198 MDIO_MMD_PMAPMD);
1212 } 1199 }
1213
1214 return;
1215} 1200}
1216 1201
1217/****************************************************************************** 1202/******************************************************************************
@@ -1272,6 +1257,4 @@ ixgb_optics_reset_bcm(struct ixgb_hw *hw)
1272 1257
1273 /* SerDes needs extra delay */ 1258 /* SerDes needs extra delay */
1274 msleep(IXGB_SUN_PHY_RESET_DELAY); 1259 msleep(IXGB_SUN_PHY_RESET_DELAY);
1275
1276 return;
1277} 1260}
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index dd4883f642be..71da325dfa80 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -488,7 +488,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
488 if (adapter->temp_dcb_cfg.pfc_mode_enable != 488 if (adapter->temp_dcb_cfg.pfc_mode_enable !=
489 adapter->dcb_cfg.pfc_mode_enable) 489 adapter->dcb_cfg.pfc_mode_enable)
490 adapter->dcb_set_bitmap |= BIT_PFC; 490 adapter->dcb_set_bitmap |= BIT_PFC;
491 return;
492} 491}
493 492
494/** 493/**
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index dc7fd5b70bc3..251767d9fe79 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1493,8 +1493,6 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
1493 tx_ring->tx_buffer_info = NULL; 1493 tx_ring->tx_buffer_info = NULL;
1494 kfree(rx_ring->rx_buffer_info); 1494 kfree(rx_ring->rx_buffer_info);
1495 rx_ring->rx_buffer_info = NULL; 1495 rx_ring->rx_buffer_info = NULL;
1496
1497 return;
1498} 1496}
1499 1497
1500static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 1498static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
@@ -1973,8 +1971,6 @@ static void ixgbe_get_wol(struct net_device *netdev,
1973 wol->wolopts |= WAKE_BCAST; 1971 wol->wolopts |= WAKE_BCAST;
1974 if (adapter->wol & IXGBE_WUFC_MAG) 1972 if (adapter->wol & IXGBE_WUFC_MAG)
1975 wol->wolopts |= WAKE_MAGIC; 1973 wol->wolopts |= WAKE_MAGIC;
1976
1977 return;
1978} 1974}
1979 1975
1980static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 1976static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 3fb9f23c7502..926ad8c2f2c7 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1615,8 +1615,6 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)
1615 1615
1616 ixgbe_write_eitr(q_vector); 1616 ixgbe_write_eitr(q_vector);
1617 } 1617 }
1618
1619 return;
1620} 1618}
1621 1619
1622static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr) 1620static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
@@ -2180,8 +2178,6 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter)
2180 2178
2181 ixgbe_write_eitr(q_vector); 2179 ixgbe_write_eitr(q_vector);
2182 } 2180 }
2183
2184 return;
2185} 2181}
2186 2182
2187/** 2183/**
@@ -4466,7 +4462,6 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
4466 adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED; 4462 adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
4467 pci_disable_msi(adapter->pdev); 4463 pci_disable_msi(adapter->pdev);
4468 } 4464 }
4469 return;
4470} 4465}
4471 4466
4472/** 4467/**
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 40f47b8fe417..a16cff7e54a3 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -946,8 +946,6 @@ static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector)
946 itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr); 946 itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
947 ixgbevf_write_eitr(adapter, v_idx, itr_reg); 947 ixgbevf_write_eitr(adapter, v_idx, itr_reg);
948 } 948 }
949
950 return;
951} 949}
952 950
953static irqreturn_t ixgbevf_msix_mbx(int irq, void *data) 951static irqreturn_t ixgbevf_msix_mbx(int irq, void *data)
@@ -2151,8 +2149,6 @@ static void ixgbevf_reset_interrupt_capability(struct ixgbevf_adapter *adapter)
2151 pci_disable_msix(adapter->pdev); 2149 pci_disable_msix(adapter->pdev);
2152 kfree(adapter->msix_entries); 2150 kfree(adapter->msix_entries);
2153 adapter->msix_entries = NULL; 2151 adapter->msix_entries = NULL;
2154
2155 return;
2156} 2152}
2157 2153
2158/** 2154/**
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 4e868eeac89e..4a090650b5aa 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -103,8 +103,6 @@ jme_mdio_write(struct net_device *netdev,
103 103
104 if (i == 0) 104 if (i == 0)
105 jeprintk(jme->pdev, "phy(%d) write timeout : %d\n", phy, reg); 105 jeprintk(jme->pdev, "phy(%d) write timeout : %d\n", phy, reg);
106
107 return;
108} 106}
109 107
110static inline void 108static inline void
@@ -130,8 +128,6 @@ jme_reset_phy_processor(struct jme_adapter *jme)
130 jme_mdio_write(jme->dev, 128 jme_mdio_write(jme->dev,
131 jme->mii_if.phy_id, 129 jme->mii_if.phy_id,
132 MII_BMCR, val | BMCR_RESET); 130 MII_BMCR, val | BMCR_RESET);
133
134 return;
135} 131}
136 132
137static void 133static void
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 64d51d627d8d..316bb70775b1 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -791,7 +791,6 @@ static void ei_receive(struct net_device *dev)
791 /* We used to also ack ENISR_OVER here, but that would sometimes mask 791 /* We used to also ack ENISR_OVER here, but that would sometimes mask
792 a real overrun, leaving the 8390 in a stopped state with rec'vr off. */ 792 a real overrun, leaving the 8390 in a stopped state with rec'vr off. */
793 ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR); 793 ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR);
794 return;
795} 794}
796 795
797/** 796/**
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 41cbaaef0654..8a1097cf8a83 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -307,8 +307,6 @@ static void lne390_reset_8390(struct net_device *dev)
307 ei_status.txing = 0; 307 ei_status.txing = 0;
308 outb(0x01, ioaddr + LNE390_RESET_PORT); 308 outb(0x01, ioaddr + LNE390_RESET_PORT);
309 if (ei_debug > 1) printk("reset done\n"); 309 if (ei_debug > 1) printk("reset done\n");
310
311 return;
312} 310}
313 311
314/* 312/*
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index c8e68fde0664..1136c9a22b67 100644
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -661,7 +661,6 @@ static void mac8390_no_reset(struct net_device *dev)
661 ei_status.txing = 0; 661 ei_status.txing = 0;
662 if (ei_debug > 1) 662 if (ei_debug > 1)
663 pr_info("reset not supported\n"); 663 pr_info("reset not supported\n");
664 return;
665} 664}
666 665
667static void interlan_reset(struct net_device *dev) 666static void interlan_reset(struct net_device *dev)
@@ -673,7 +672,6 @@ static void interlan_reset(struct net_device *dev)
673 target[0xC0000] = 0; 672 target[0xC0000] = 0;
674 if (ei_debug > 1) 673 if (ei_debug > 1)
675 pr_cont("reset complete\n"); 674 pr_cont("reset complete\n");
676 return;
677} 675}
678 676
679/* dayna_memcpy_fromio/dayna_memcpy_toio */ 677/* dayna_memcpy_fromio/dayna_memcpy_toio */
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 16a35944c2da..42e3294671d7 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -748,8 +748,6 @@ static void meth_tx_timeout(struct net_device *dev)
748 748
749 dev->trans_start = jiffies; /* prevent tx timeout */ 749 dev->trans_start = jiffies; /* prevent tx timeout */
750 netif_wake_queue(dev); 750 netif_wake_queue(dev);
751
752 return;
753} 751}
754 752
755/* 753/*
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c
index 86467b444ac6..d5afd037cd7d 100644
--- a/drivers/net/mlx4/en_ethtool.c
+++ b/drivers/net/mlx4/en_ethtool.c
@@ -140,8 +140,6 @@ static void mlx4_en_get_wol(struct net_device *netdev,
140{ 140{
141 wol->supported = 0; 141 wol->supported = 0;
142 wol->wolopts = 0; 142 wol->wolopts = 0;
143
144 return;
145} 143}
146 144
147static int mlx4_en_get_sset_count(struct net_device *dev, int sset) 145static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index 7bd6662d5b04..e0b0ef11f110 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -608,7 +608,6 @@ retry:
608 608
609 outb_p(ENISR_RDC, NE_BASE + EN0_ISR); /* Ack intr. */ 609 outb_p(ENISR_RDC, NE_BASE + EN0_ISR); /* Ack intr. */
610 ei_status.dmaing &= ~0x01; 610 ei_status.dmaing &= ~0x01;
611 return;
612} 611}
613 612
614 613
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index f4347f88b6f2..b8e2923a1d69 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -785,7 +785,6 @@ retry:
785 785
786 outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ 786 outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
787 ei_status.dmaing &= ~0x01; 787 ei_status.dmaing &= ~0x01;
788 return;
789} 788}
790 789
791static int __init ne_drv_probe(struct platform_device *pdev) 790static int __init ne_drv_probe(struct platform_device *pdev)
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index ff3c4c814988..70cdc6996342 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -730,7 +730,6 @@ retry:
730 730
731 outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ 731 outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
732 ei_status.dmaing &= ~0x01; 732 ei_status.dmaing &= ~0x01;
733 return;
734} 733}
735 734
736 735
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 85aec4f10131..3c333cb5d34e 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -631,7 +631,6 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,
631 631
632 outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ 632 outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
633 ei_status.dmaing &= ~0x01; 633 ei_status.dmaing &= ~0x01;
634 return;
635} 634}
636 635
637static void ne2k_pci_get_drvinfo(struct net_device *dev, 636static void ne2k_pci_get_drvinfo(struct net_device *dev,
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index a00bbfb9aed0..243ed2aee88e 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -255,8 +255,6 @@ static void ne3210_reset_8390(struct net_device *dev)
255 ei_status.txing = 0; 255 ei_status.txing = 0;
256 outb(0x01, ioaddr + NE3210_RESET_PORT); 256 outb(0x01, ioaddr + NE3210_RESET_PORT);
257 if (ei_debug > 1) printk("reset done\n"); 257 if (ei_debug > 1) printk("reset done\n");
258
259 return;
260} 258}
261 259
262/* 260/*
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 4a2bbeb1dceb..045a7c8f5bdf 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1901,6 +1901,5 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
1901void netxen_nic_clear_stats(struct netxen_adapter *adapter) 1901void netxen_nic_clear_stats(struct netxen_adapter *adapter)
1902{ 1902{
1903 memset(&adapter->stats, 0, sizeof(adapter->stats)); 1903 memset(&adapter->stats, 0, sizeof(adapter->stats));
1904 return;
1905} 1904}
1906 1905
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 692e672d303d..c61a61f177b7 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -2781,7 +2781,6 @@ netxen_config_indev_addr(struct net_device *dev, unsigned long event)
2781 } endfor_ifa(indev); 2781 } endfor_ifa(indev);
2782 2782
2783 in_dev_put(indev); 2783 in_dev_put(indev);
2784 return;
2785} 2784}
2786 2785
2787static int netxen_netdev_event(struct notifier_block *this, 2786static int netxen_netdev_event(struct notifier_block *this,
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index f80b50159114..4d3f2e2b28bd 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -514,8 +514,6 @@ static void dump_packet(void *buf, int len)
514 if (i % 16 == 15) printk("\n"); 514 if (i % 16 == 15) printk("\n");
515 } 515 }
516 printk("\n"); 516 printk("\n");
517
518 return;
519} 517}
520 518
521/* We have a good packet, get it out of the buffer. */ 519/* We have a good packet, get it out of the buffer. */
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c
index 43bf26fb5133..000e792d57c0 100644
--- a/drivers/net/octeon/octeon_mgmt.c
+++ b/drivers/net/octeon/octeon_mgmt.c
@@ -1005,7 +1005,6 @@ static void octeon_mgmt_poll_controller(struct net_device *netdev)
1005 1005
1006 octeon_mgmt_receive_packets(p, 16); 1006 octeon_mgmt_receive_packets(p, 16);
1007 octeon_mgmt_update_rx_stats(netdev); 1007 octeon_mgmt_update_rx_stats(netdev);
1008 return;
1009} 1008}
1010#endif 1009#endif
1011 1010
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 370c147d08a3..8ab6ae0a6107 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1472,8 +1472,6 @@ static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
1472 txring->next_to_fill = fill; 1472 txring->next_to_fill = fill;
1473 1473
1474 write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2); 1474 write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
1475
1476 return;
1477} 1475}
1478 1476
1479static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) 1477static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index b6d9313cec00..29d288e7da93 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -622,8 +622,6 @@ static void mdio_write(unsigned int ioaddr, int phy_id, int location, int value)
622 outw(MDIO_ENB_IN, mdio_addr); 622 outw(MDIO_ENB_IN, mdio_addr);
623 outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); 623 outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
624 } 624 }
625
626 return;
627} 625}
628 626
629/* Reset and restore all of the 3c574 registers. */ 627/* Reset and restore all of the 3c574 registers. */
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index a1a6b087e242..d605db28e6fa 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1510,8 +1510,6 @@ static void ei_receive(struct net_device *dev)
1510 ei_local->current_page = next_frame; 1510 ei_local->current_page = next_frame;
1511 outb_p(next_frame-1, e8390_base+EN0_BOUNDARY); 1511 outb_p(next_frame-1, e8390_base+EN0_BOUNDARY);
1512 } 1512 }
1513
1514 return;
1515} 1513}
1516 1514
1517/** 1515/**
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 16fc3e53c5cb..451a4548494d 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -1081,8 +1081,6 @@ static void fjn_rx(struct net_device *dev)
1081 "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i); 1081 "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i);
1082 } 1082 }
1083*/ 1083*/
1084
1085 return;
1086} /* fjn_rx */ 1084} /* fjn_rx */
1087 1085
1088/*====================================================================*/ 1086/*====================================================================*/
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index 37f4a6fdc3ef..3b0754b8ccd2 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -402,8 +402,6 @@ static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase)
402 402
403 /* 0x40 will release the card for use */ 403 /* 0x40 will release the card for use */
404 outb(0x40, dev->base_addr); 404 outb(0x40, dev->base_addr);
405
406 return;
407} 405}
408 406
409static struct pcmcia_device_id ibmtr_ids[] = { 407static struct pcmcia_device_id ibmtr_ids[] = {
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index ca4efd2871f3..89ba2f12e018 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1313,8 +1313,6 @@ static void update_stats(unsigned int ioaddr, struct net_device *dev)
1313 lp->linux_stats.tx_fifo_errors = lp->mace_stats.uflo; 1313 lp->linux_stats.tx_fifo_errors = lp->mace_stats.uflo;
1314 lp->linux_stats.tx_heartbeat_errors = lp->mace_stats.cerr; 1314 lp->linux_stats.tx_heartbeat_errors = lp->mace_stats.cerr;
1315 /* lp->linux_stats.tx_window_errors; */ 1315 /* lp->linux_stats.tx_window_errors; */
1316
1317 return;
1318} /* update_stats */ 1316} /* update_stats */
1319 1317
1320/* ---------------------------------------------------------------------------- 1318/* ----------------------------------------------------------------------------
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index b5c62db251db..7da544c5fd5a 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1239,7 +1239,6 @@ static void smc_hardware_send_packet(struct net_device * dev)
1239 dev_kfree_skb_irq(skb); 1239 dev_kfree_skb_irq(skb);
1240 dev->trans_start = jiffies; 1240 dev->trans_start = jiffies;
1241 netif_start_queue(dev); 1241 netif_start_queue(dev);
1242 return;
1243} 1242}
1244 1243
1245/*====================================================================*/ 1244/*====================================================================*/
@@ -1369,7 +1368,6 @@ static void smc_tx_err(struct net_device * dev)
1369 smc->packets_waiting--; 1368 smc->packets_waiting--;
1370 1369
1371 outw(saved_packet, ioaddr + PNR_ARR); 1370 outw(saved_packet, ioaddr + PNR_ARR);
1372 return;
1373} 1371}
1374 1372
1375/*====================================================================*/ 1373/*====================================================================*/
@@ -1589,8 +1587,6 @@ static void smc_rx(struct net_device *dev)
1589 } 1587 }
1590 /* Let the MMU free the memory of this packet. */ 1588 /* Let the MMU free the memory of this packet. */
1591 outw(MC_RELEASE, ioaddr + MMU_CMD); 1589 outw(MC_RELEASE, ioaddr + MMU_CMD);
1592
1593 return;
1594} 1590}
1595 1591
1596/*====================================================================== 1592/*======================================================================
@@ -1640,8 +1636,6 @@ static void set_rx_mode(struct net_device *dev)
1640 outw(rx_cfg_setting, ioaddr + RCR); 1636 outw(rx_cfg_setting, ioaddr + RCR);
1641 SMC_SELECT_BANK(2); 1637 SMC_SELECT_BANK(2);
1642 spin_unlock_irqrestore(&smc->lock, flags); 1638 spin_unlock_irqrestore(&smc->lock, flags);
1643
1644 return;
1645} 1639}
1646 1640
1647/*====================================================================== 1641/*======================================================================
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 566fd89da861..c200c2821730 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -647,7 +647,6 @@ free_new_rx_ring:
647 (1 << size), 647 (1 << size),
648 new_rx_ring, 648 new_rx_ring,
649 new_ring_dma_addr); 649 new_ring_dma_addr);
650 return;
651} 650}
652 651
653static void pcnet32_purge_rx_ring(struct net_device *dev) 652static void pcnet32_purge_rx_ring(struct net_device *dev)
@@ -1215,7 +1214,6 @@ static void pcnet32_rx_entry(struct net_device *dev,
1215 skb->protocol = eth_type_trans(skb, dev); 1214 skb->protocol = eth_type_trans(skb, dev);
1216 netif_receive_skb(skb); 1215 netif_receive_skb(skb);
1217 dev->stats.rx_packets++; 1216 dev->stats.rx_packets++;
1218 return;
1219} 1217}
1220 1218
1221static int pcnet32_rx(struct net_device *dev, int budget) 1219static int pcnet32_rx(struct net_device *dev, int budget)
@@ -2623,7 +2621,6 @@ static void pcnet32_load_multicast(struct net_device *dev)
2623 for (i = 0; i < 4; i++) 2621 for (i = 0; i < 4; i++)
2624 lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i, 2622 lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
2625 le16_to_cpu(mcast_table[i])); 2623 le16_to_cpu(mcast_table[i]));
2626 return;
2627} 2624}
2628 2625
2629/* 2626/*
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 729ab29ba28c..a73ba0bcc0ce 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -97,7 +97,6 @@ static void ns_giga_speed_fallback(struct phy_device *phydev, int mode)
97 phy_write(phydev, NS_EXP_MEM_DATA, 0x0008); 97 phy_write(phydev, NS_EXP_MEM_DATA, 0x0008);
98 phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN)); 98 phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN));
99 phy_write(phydev, LED_CTRL_REG, mode); 99 phy_write(phydev, LED_CTRL_REG, mode);
100 return;
101} 100}
102 101
103static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) 102static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable)
@@ -110,8 +109,6 @@ static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable)
110 109
111 printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n", 110 printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n",
112 (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); 111 (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
113
114 return;
115} 112}
116 113
117static int ns_config_init(struct phy_device *phydev) 114static int ns_config_init(struct phy_device *phydev)
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index f4e1f9a38b87..ec0349e84a8a 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -1191,8 +1191,6 @@ plip_wakeup(void *handle)
1191 /* Clear the data port. */ 1191 /* Clear the data port. */
1192 write_data (dev, 0x00); 1192 write_data (dev, 0x00);
1193 } 1193 }
1194
1195 return;
1196} 1194}
1197 1195
1198static int 1196static int
@@ -1308,7 +1306,6 @@ err_parport_unregister:
1308 parport_unregister_device(nl->pardev); 1306 parport_unregister_device(nl->pardev);
1309err_free_dev: 1307err_free_dev:
1310 free_netdev(dev); 1308 free_netdev(dev);
1311 return;
1312} 1309}
1313 1310
1314/* plip_detach() is called (by the parport code) when a port is 1311/* plip_detach() is called (by the parport code) when a port is
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index d4ff627c6f7a..a7bc406658e1 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -301,7 +301,6 @@ static void gelic_wl_get_ch_info(struct gelic_wl_info *wl)
301 /* 16 bits of MSB has available channels */ 301 /* 16 bits of MSB has available channels */
302 wl->ch_info = ch_info_raw >> 48; 302 wl->ch_info = ch_info_raw >> 48;
303 } 303 }
304 return;
305} 304}
306 305
307/* SIOGIWRANGE */ 306/* SIOGIWRANGE */
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 01a6ca303a17..54ebb65ada18 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -222,7 +222,6 @@ static void ql_write_common_reg_l(struct ql3_adapter *qdev,
222 writel(value, reg); 222 writel(value, reg);
223 readl(reg); 223 readl(reg);
224 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); 224 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
225 return;
226} 225}
227 226
228static void ql_write_common_reg(struct ql3_adapter *qdev, 227static void ql_write_common_reg(struct ql3_adapter *qdev,
@@ -230,7 +229,6 @@ static void ql_write_common_reg(struct ql3_adapter *qdev,
230{ 229{
231 writel(value, reg); 230 writel(value, reg);
232 readl(reg); 231 readl(reg);
233 return;
234} 232}
235 233
236static void ql_write_nvram_reg(struct ql3_adapter *qdev, 234static void ql_write_nvram_reg(struct ql3_adapter *qdev,
@@ -239,7 +237,6 @@ static void ql_write_nvram_reg(struct ql3_adapter *qdev,
239 writel(value, reg); 237 writel(value, reg);
240 readl(reg); 238 readl(reg);
241 udelay(1); 239 udelay(1);
242 return;
243} 240}
244 241
245static void ql_write_page0_reg(struct ql3_adapter *qdev, 242static void ql_write_page0_reg(struct ql3_adapter *qdev,
@@ -249,7 +246,6 @@ static void ql_write_page0_reg(struct ql3_adapter *qdev,
249 ql_set_register_page(qdev,0); 246 ql_set_register_page(qdev,0);
250 writel(value, reg); 247 writel(value, reg);
251 readl(reg); 248 readl(reg);
252 return;
253} 249}
254 250
255/* 251/*
@@ -262,7 +258,6 @@ static void ql_write_page1_reg(struct ql3_adapter *qdev,
262 ql_set_register_page(qdev,1); 258 ql_set_register_page(qdev,1);
263 writel(value, reg); 259 writel(value, reg);
264 readl(reg); 260 readl(reg);
265 return;
266} 261}
267 262
268/* 263/*
@@ -275,7 +270,6 @@ static void ql_write_page2_reg(struct ql3_adapter *qdev,
275 ql_set_register_page(qdev,2); 270 ql_set_register_page(qdev,2);
276 writel(value, reg); 271 writel(value, reg);
277 readl(reg); 272 readl(reg);
278 return;
279} 273}
280 274
281static void ql_disable_interrupts(struct ql3_adapter *qdev) 275static void ql_disable_interrupts(struct ql3_adapter *qdev)
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index ee573fe52a8e..0a2d7148f650 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -239,7 +239,6 @@ qlcnic_napi_disable(struct qlcnic_adapter *adapter)
239static void qlcnic_clear_stats(struct qlcnic_adapter *adapter) 239static void qlcnic_clear_stats(struct qlcnic_adapter *adapter)
240{ 240{
241 memset(&adapter->stats, 0, sizeof(adapter->stats)); 241 memset(&adapter->stats, 0, sizeof(adapter->stats));
242 return;
243} 242}
244 243
245static int qlcnic_set_dma_mask(struct qlcnic_adapter *adapter) 244static int qlcnic_set_dma_mask(struct qlcnic_adapter *adapter)
@@ -2662,7 +2661,6 @@ qlcnic_config_indev_addr(struct net_device *dev, unsigned long event)
2662 } endfor_ifa(indev); 2661 } endfor_ifa(indev);
2663 2662
2664 in_dev_put(indev); 2663 in_dev_put(indev);
2665 return;
2666} 2664}
2667 2665
2668static int qlcnic_netdev_event(struct notifier_block *this, 2666static int qlcnic_netdev_event(struct notifier_block *this,
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c
index 7e09ff4a5755..4892d64f4e05 100644
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@ -181,8 +181,6 @@ quit:
181 spin_unlock(&qdev->stats_lock); 181 spin_unlock(&qdev->stats_lock);
182 182
183 QL_DUMP_STAT(qdev); 183 QL_DUMP_STAT(qdev);
184
185 return;
186} 184}
187 185
188static char ql_stats_str_arr[][ETH_GSTRING_LEN] = { 186static char ql_stats_str_arr[][ETH_GSTRING_LEN] = {
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index f155928bf14e..668327ccd8d0 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2943,7 +2943,6 @@ static void s2io_netpoll(struct net_device *dev)
2943 } 2943 }
2944 } 2944 }
2945 enable_irq(dev->irq); 2945 enable_irq(dev->irq);
2946 return;
2947} 2946}
2948#endif 2947#endif
2949 2948
@@ -4756,7 +4755,6 @@ reset:
4756 s2io_stop_all_tx_queue(sp); 4755 s2io_stop_all_tx_queue(sp);
4757 schedule_work(&sp->rst_timer_task); 4756 schedule_work(&sp->rst_timer_task);
4758 sw_stat->soft_reset_cnt++; 4757 sw_stat->soft_reset_cnt++;
4759 return;
4760} 4758}
4761 4759
4762/** 4760/**
@@ -8645,7 +8643,6 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
8645 first->truesize += skb->truesize; 8643 first->truesize += skb->truesize;
8646 lro->last_frag = skb; 8644 lro->last_frag = skb;
8647 swstats->clubbed_frms_cnt++; 8645 swstats->clubbed_frms_cnt++;
8648 return;
8649} 8646}
8650 8647
8651/** 8648/**
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
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 11ab32e0060b..d2fce98f557f 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -578,7 +578,6 @@ static void seeq8005_rx(struct net_device *dev)
578 /* If any worth-while packets have been received, netif_rx() 578 /* If any worth-while packets have been received, netif_rx()
579 has done a mark_bh(NET_BH) for us and will work on them 579 has done a mark_bh(NET_BH) for us and will work on them
580 when we get to the bottom-half routine. */ 580 when we get to the bottom-half routine. */
581 return;
582} 581}
583 582
584/* The inverse routine to net_open(). */ 583/* The inverse routine to net_open(). */
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 11f7ebedcde5..bbbded76ff14 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -858,7 +858,6 @@ static void mdio_reset(long mdio_addr)
858 outl(MDDIR | MDIO | MDC, mdio_addr); 858 outl(MDDIR | MDIO | MDC, mdio_addr);
859 mdio_delay(); 859 mdio_delay();
860 } 860 }
861 return;
862} 861}
863 862
864/** 863/**
@@ -953,8 +952,6 @@ static void mdio_write(struct net_device *net_dev, int phy_id, int location,
953 mdio_delay(); 952 mdio_delay();
954 } 953 }
955 outl(0x00, mdio_addr); 954 outl(0x00, mdio_addr);
956
957 return;
958} 955}
959 956
960 957
@@ -1264,7 +1261,6 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision)
1264 mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, 1261 mdio_write(net_dev, sis_priv->cur_phy, MII_RESV,
1265 (reg14h | 0x2000) & 0xBFFF); 1262 (reg14h | 0x2000) & 0xBFFF);
1266 } 1263 }
1267 return;
1268} 1264}
1269 1265
1270/** 1266/**
@@ -1560,7 +1556,6 @@ static void sis900_tx_timeout(struct net_device *net_dev)
1560 1556
1561 /* Enable all known interrupts by setting the interrupt mask. */ 1557 /* Enable all known interrupts by setting the interrupt mask. */
1562 outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); 1558 outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
1563 return;
1564} 1559}
1565 1560
1566/** 1561/**
@@ -2330,8 +2325,6 @@ static void set_rx_mode(struct net_device *net_dev)
2330 /* restore cr */ 2325 /* restore cr */
2331 outl(cr_saved, ioaddr + cr); 2326 outl(cr_saved, ioaddr + cr);
2332 } 2327 }
2333
2334 return;
2335} 2328}
2336 2329
2337/** 2330/**
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 91adc38d5710..31b2dabf094c 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -844,7 +844,6 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
844 spin_lock_irqsave(&bp->DriverLock, Flags); 844 spin_lock_irqsave(&bp->DriverLock, Flags);
845 skfp_ctl_set_multicast_list_wo_lock(dev); 845 skfp_ctl_set_multicast_list_wo_lock(dev);
846 spin_unlock_irqrestore(&bp->DriverLock, Flags); 846 spin_unlock_irqrestore(&bp->DriverLock, Flags);
847 return;
848} // skfp_ctl_set_multicast_list 847} // skfp_ctl_set_multicast_list
849 848
850 849
@@ -898,7 +897,6 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
898 /* Update adapter filters */ 897 /* Update adapter filters */
899 mac_update_multicast(smc); 898 mac_update_multicast(smc);
900 } 899 }
901 return;
902} // skfp_ctl_set_multicast_list_wo_lock 900} // skfp_ctl_set_multicast_list_wo_lock
903 901
904 902
diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c
index 140d63f3cafa..ac279fad9d45 100644
--- a/drivers/net/slhc.c
+++ b/drivers/net/slhc.c
@@ -731,7 +731,6 @@ void
731slhc_free(struct slcompress *comp) 731slhc_free(struct slcompress *comp)
732{ 732{
733 printk(KERN_DEBUG "Called IP function on non IP-system: slhc_free"); 733 printk(KERN_DEBUG "Called IP function on non IP-system: slhc_free");
734 return;
735} 734}
736struct slcompress * 735struct slcompress *
737slhc_init(int rslots, int tslots) 736slhc_init(int rslots, int tslots)
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index a93f122e9a96..d07c39cb4daf 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -460,7 +460,6 @@ static void ultramca_reset_8390(struct net_device *dev)
460 460
461 if (ei_debug > 1) 461 if (ei_debug > 1)
462 printk("reset done\n"); 462 printk("reset done\n");
463 return;
464} 463}
465 464
466/* Grab the 8390 specific header. Similar to the block_input routine, but 465/* Grab the 8390 specific header. Similar to the block_input routine, but
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 0291ea098a06..d2dd8e6113ab 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -421,7 +421,6 @@ ultra_reset_8390(struct net_device *dev)
421 outb(0x01, cmd_port + 6); /* Enable interrupts and memory. */ 421 outb(0x01, cmd_port + 6); /* Enable interrupts and memory. */
422 422
423 if (ei_debug > 1) printk("reset done\n"); 423 if (ei_debug > 1) printk("reset done\n");
424 return;
425} 424}
426 425
427/* Grab the 8390 specific header. Similar to the block_input routine, but 426/* Grab the 8390 specific header. Similar to the block_input routine, but
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 7a554adc70fb..e459c3b2510a 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -352,7 +352,6 @@ static void ultra32_reset_8390(struct net_device *dev)
352 outb(0x84, ioaddr + 5); /* Enable MEM16 & Disable Bus Master. */ 352 outb(0x84, ioaddr + 5); /* Enable MEM16 & Disable Bus Master. */
353 outb(0x01, ioaddr + 6); /* Enable Interrupts. */ 353 outb(0x01, ioaddr + 6); /* Enable Interrupts. */
354 if (ei_debug > 1) printk("reset done\n"); 354 if (ei_debug > 1) printk("reset done\n");
355 return;
356} 355}
357 356
358/* Grab the 8390 specific header. Similar to the block_input routine, but 357/* Grab the 8390 specific header. Similar to the block_input routine, but
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index acb81a876ac6..7486d0908064 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -691,8 +691,6 @@ static void smc_hardware_send_packet( struct net_device * dev )
691 691
692 /* we can send another packet */ 692 /* we can send another packet */
693 netif_wake_queue(dev); 693 netif_wake_queue(dev);
694
695 return;
696} 694}
697 695
698/*------------------------------------------------------------------------- 696/*-------------------------------------------------------------------------
@@ -1355,7 +1353,6 @@ static void smc_tx( struct net_device * dev )
1355 lp->packets_waiting--; 1353 lp->packets_waiting--;
1356 1354
1357 outb( saved_packet, ioaddr + PNR_ARR ); 1355 outb( saved_packet, ioaddr + PNR_ARR );
1358 return;
1359} 1356}
1360 1357
1361/*-------------------------------------------------------------------- 1358/*--------------------------------------------------------------------
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 3dff280b438b..1636a34d95dd 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -2095,8 +2095,6 @@ static void spider_net_link_phy(unsigned long data)
2095 card->netdev->name, phy->speed, 2095 card->netdev->name, phy->speed,
2096 phy->duplex == 1 ? "Full" : "Half", 2096 phy->duplex == 1 ? "Full" : "Half",
2097 phy->autoneg == 1 ? "" : "no "); 2097 phy->autoneg == 1 ? "" : "no ");
2098
2099 return;
2100} 2098}
2101 2099
2102/** 2100/**
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index e19b5a143886..74b7ae76906e 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1221,8 +1221,6 @@ static void init_ring(struct net_device *dev)
1221 1221
1222 for (i = 0; i < TX_RING_SIZE; i++) 1222 for (i = 0; i < TX_RING_SIZE; i++)
1223 memset(&np->tx_info[i], 0, sizeof(np->tx_info[i])); 1223 memset(&np->tx_info[i], 0, sizeof(np->tx_info[i]));
1224
1225 return;
1226} 1224}
1227 1225
1228 1226
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index 0aa89ae9b8e9..917b4e16923b 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -48,7 +48,6 @@ static void dwmac1000_core_init(unsigned long ioaddr)
48 /* Tag detection without filtering */ 48 /* Tag detection without filtering */
49 writel(0x0, ioaddr + GMAC_VLAN_TAG); 49 writel(0x0, ioaddr + GMAC_VLAN_TAG);
50#endif 50#endif
51 return;
52} 51}
53 52
54static void dwmac1000_dump_regs(unsigned long ioaddr) 53static void dwmac1000_dump_regs(unsigned long ioaddr)
@@ -61,7 +60,6 @@ static void dwmac1000_dump_regs(unsigned long ioaddr)
61 pr_info("\tReg No. %d (offset 0x%x): 0x%08x\n", i, 60 pr_info("\tReg No. %d (offset 0x%x): 0x%08x\n", i,
62 offset, readl(ioaddr + offset)); 61 offset, readl(ioaddr + offset));
63 } 62 }
64 return;
65} 63}
66 64
67static void dwmac1000_set_umac_addr(unsigned long ioaddr, unsigned char *addr, 65static void dwmac1000_set_umac_addr(unsigned long ioaddr, unsigned char *addr,
@@ -139,8 +137,6 @@ static void dwmac1000_set_filter(struct net_device *dev)
139 CHIP_DBG(KERN_INFO "\tFrame Filter reg: 0x%08x\n\tHash regs: " 137 CHIP_DBG(KERN_INFO "\tFrame Filter reg: 0x%08x\n\tHash regs: "
140 "HI 0x%08x, LO 0x%08x\n", readl(ioaddr + GMAC_FRAME_FILTER), 138 "HI 0x%08x, LO 0x%08x\n", readl(ioaddr + GMAC_FRAME_FILTER),
141 readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW)); 139 readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW));
142
143 return;
144} 140}
145 141
146static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex, 142static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex,
@@ -164,7 +160,6 @@ static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex,
164 } 160 }
165 161
166 writel(flow, ioaddr + GMAC_FLOW_CTRL); 162 writel(flow, ioaddr + GMAC_FLOW_CTRL);
167 return;
168} 163}
169 164
170static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode) 165static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode)
@@ -180,7 +175,6 @@ static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode)
180 } 175 }
181 176
182 writel(pmt, ioaddr + GMAC_PMT); 177 writel(pmt, ioaddr + GMAC_PMT);
183 return;
184} 178}
185 179
186 180
@@ -204,8 +198,6 @@ static void dwmac1000_irq_status(unsigned long ioaddr)
204 * status register. */ 198 * status register. */
205 readl(ioaddr + GMAC_PMT); 199 readl(ioaddr + GMAC_PMT);
206 } 200 }
207
208 return;
209} 201}
210 202
211struct stmmac_ops dwmac1000_ops = { 203struct stmmac_ops dwmac1000_ops = {
diff --git a/drivers/net/stmmac/dwmac1000_dma.c b/drivers/net/stmmac/dwmac1000_dma.c
index a547aa99e114..415805057cb0 100644
--- a/drivers/net/stmmac/dwmac1000_dma.c
+++ b/drivers/net/stmmac/dwmac1000_dma.c
@@ -107,7 +107,6 @@ static void dwmac1000_dma_operation_mode(unsigned long ioaddr, int txmode,
107 } 107 }
108 108
109 writel(csr6, ioaddr + DMA_CONTROL); 109 writel(csr6, ioaddr + DMA_CONTROL);
110 return;
111} 110}
112 111
113/* Not yet implemented --- no RMON module */ 112/* Not yet implemented --- no RMON module */
@@ -129,7 +128,6 @@ static void dwmac1000_dump_dma_regs(unsigned long ioaddr)
129 readl(ioaddr + DMA_BUS_MODE + offset)); 128 readl(ioaddr + DMA_BUS_MODE + offset));
130 } 129 }
131 } 130 }
132 return;
133} 131}
134 132
135struct stmmac_dma_ops dwmac1000_dma_ops = { 133struct stmmac_dma_ops dwmac1000_dma_ops = {
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/stmmac/dwmac100_core.c
index fab14a4cb14c..6f270a0e151a 100644
--- a/drivers/net/stmmac/dwmac100_core.c
+++ b/drivers/net/stmmac/dwmac100_core.c
@@ -40,7 +40,6 @@ static void dwmac100_core_init(unsigned long ioaddr)
40#ifdef STMMAC_VLAN_TAG_USED 40#ifdef STMMAC_VLAN_TAG_USED
41 writel(ETH_P_8021Q, ioaddr + MAC_VLAN1); 41 writel(ETH_P_8021Q, ioaddr + MAC_VLAN1);
42#endif 42#endif
43 return;
44} 43}
45 44
46static void dwmac100_dump_mac_regs(unsigned long ioaddr) 45static void dwmac100_dump_mac_regs(unsigned long ioaddr)
@@ -76,7 +75,6 @@ static void dwmac100_dump_mac_regs(unsigned long ioaddr)
76 MMC_HIGH_INTR_MASK, readl(ioaddr + MMC_HIGH_INTR_MASK)); 75 MMC_HIGH_INTR_MASK, readl(ioaddr + MMC_HIGH_INTR_MASK));
77 pr_info("\t MMC Low Interrupt Mask (offset 0x%x): 0x%08x\n", 76 pr_info("\t MMC Low Interrupt Mask (offset 0x%x): 0x%08x\n",
78 MMC_LOW_INTR_MASK, readl(ioaddr + MMC_LOW_INTR_MASK)); 77 MMC_LOW_INTR_MASK, readl(ioaddr + MMC_LOW_INTR_MASK));
79 return;
80} 78}
81 79
82static void dwmac100_irq_status(unsigned long ioaddr) 80static void dwmac100_irq_status(unsigned long ioaddr)
@@ -145,7 +143,6 @@ static void dwmac100_set_filter(struct net_device *dev)
145 "HI 0x%08x, LO 0x%08x\n", 143 "HI 0x%08x, LO 0x%08x\n",
146 __func__, readl(ioaddr + MAC_CONTROL), 144 __func__, readl(ioaddr + MAC_CONTROL),
147 readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW)); 145 readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW));
148 return;
149} 146}
150 147
151static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex, 148static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex,
@@ -156,8 +153,6 @@ static void dwmac100_flow_ctrl(unsigned long ioaddr, unsigned int duplex,
156 if (duplex) 153 if (duplex)
157 flow |= (pause_time << MAC_FLOW_CTRL_PT_SHIFT); 154 flow |= (pause_time << MAC_FLOW_CTRL_PT_SHIFT);
158 writel(flow, ioaddr + MAC_FLOW_CTRL); 155 writel(flow, ioaddr + MAC_FLOW_CTRL);
159
160 return;
161} 156}
162 157
163/* No PMT module supported for this Ethernet Controller. 158/* No PMT module supported for this Ethernet Controller.
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/stmmac/dwmac100_dma.c
index 96d098d68ad6..2fece7b72727 100644
--- a/drivers/net/stmmac/dwmac100_dma.c
+++ b/drivers/net/stmmac/dwmac100_dma.c
@@ -71,8 +71,6 @@ static void dwmac100_dma_operation_mode(unsigned long ioaddr, int txmode,
71 csr6 |= DMA_CONTROL_TTC_128; 71 csr6 |= DMA_CONTROL_TTC_128;
72 72
73 writel(csr6, ioaddr + DMA_CONTROL); 73 writel(csr6, ioaddr + DMA_CONTROL);
74
75 return;
76} 74}
77 75
78static void dwmac100_dump_dma_regs(unsigned long ioaddr) 76static void dwmac100_dump_dma_regs(unsigned long ioaddr)
@@ -88,7 +86,6 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr)
88 DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR)); 86 DMA_CUR_TX_BUF_ADDR, readl(ioaddr + DMA_CUR_TX_BUF_ADDR));
89 CHIP_DBG(KERN_DEBUG "\t CSR21 (offset 0x%x): 0x%08x\n", 87 CHIP_DBG(KERN_DEBUG "\t CSR21 (offset 0x%x): 0x%08x\n",
90 DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR)); 88 DMA_CUR_RX_BUF_ADDR, readl(ioaddr + DMA_CUR_RX_BUF_ADDR));
91 return;
92} 89}
93 90
94/* DMA controller has two counters to track the number of 91/* DMA controller has two counters to track the number of
@@ -119,7 +116,6 @@ static void dwmac100_dma_diagnostic_fr(void *data, struct stmmac_extra_stats *x,
119 x->rx_missed_cntr += miss_f; 116 x->rx_missed_cntr += miss_f;
120 } 117 }
121 } 118 }
122 return;
123} 119}
124 120
125struct stmmac_dma_ops dwmac100_dma_ops = { 121struct stmmac_dma_ops dwmac100_dma_ops = {
diff --git a/drivers/net/stmmac/dwmac_lib.c b/drivers/net/stmmac/dwmac_lib.c
index 0a504adb7eb3..a85415216ef4 100644
--- a/drivers/net/stmmac/dwmac_lib.c
+++ b/drivers/net/stmmac/dwmac_lib.c
@@ -52,7 +52,6 @@ void dwmac_dma_start_tx(unsigned long ioaddr)
52 u32 value = readl(ioaddr + DMA_CONTROL); 52 u32 value = readl(ioaddr + DMA_CONTROL);
53 value |= DMA_CONTROL_ST; 53 value |= DMA_CONTROL_ST;
54 writel(value, ioaddr + DMA_CONTROL); 54 writel(value, ioaddr + DMA_CONTROL);
55 return;
56} 55}
57 56
58void dwmac_dma_stop_tx(unsigned long ioaddr) 57void dwmac_dma_stop_tx(unsigned long ioaddr)
@@ -60,7 +59,6 @@ void dwmac_dma_stop_tx(unsigned long ioaddr)
60 u32 value = readl(ioaddr + DMA_CONTROL); 59 u32 value = readl(ioaddr + DMA_CONTROL);
61 value &= ~DMA_CONTROL_ST; 60 value &= ~DMA_CONTROL_ST;
62 writel(value, ioaddr + DMA_CONTROL); 61 writel(value, ioaddr + DMA_CONTROL);
63 return;
64} 62}
65 63
66void dwmac_dma_start_rx(unsigned long ioaddr) 64void dwmac_dma_start_rx(unsigned long ioaddr)
@@ -68,8 +66,6 @@ void dwmac_dma_start_rx(unsigned long ioaddr)
68 u32 value = readl(ioaddr + DMA_CONTROL); 66 u32 value = readl(ioaddr + DMA_CONTROL);
69 value |= DMA_CONTROL_SR; 67 value |= DMA_CONTROL_SR;
70 writel(value, ioaddr + DMA_CONTROL); 68 writel(value, ioaddr + DMA_CONTROL);
71
72 return;
73} 69}
74 70
75void dwmac_dma_stop_rx(unsigned long ioaddr) 71void dwmac_dma_stop_rx(unsigned long ioaddr)
@@ -77,8 +73,6 @@ void dwmac_dma_stop_rx(unsigned long ioaddr)
77 u32 value = readl(ioaddr + DMA_CONTROL); 73 u32 value = readl(ioaddr + DMA_CONTROL);
78 value &= ~DMA_CONTROL_SR; 74 value &= ~DMA_CONTROL_SR;
79 writel(value, ioaddr + DMA_CONTROL); 75 writel(value, ioaddr + DMA_CONTROL);
80
81 return;
82} 76}
83 77
84#ifdef DWMAC_DMA_DEBUG 78#ifdef DWMAC_DMA_DEBUG
@@ -111,7 +105,6 @@ static void show_tx_process_state(unsigned int status)
111 default: 105 default:
112 break; 106 break;
113 } 107 }
114 return;
115} 108}
116 109
117static void show_rx_process_state(unsigned int status) 110static void show_rx_process_state(unsigned int status)
@@ -149,7 +142,6 @@ static void show_rx_process_state(unsigned int status)
149 default: 142 default:
150 break; 143 break;
151 } 144 }
152 return;
153} 145}
154#endif 146#endif
155 147
@@ -244,8 +236,6 @@ void stmmac_set_mac_addr(unsigned long ioaddr, u8 addr[6],
244 writel(data, ioaddr + high); 236 writel(data, ioaddr + high);
245 data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0]; 237 data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0];
246 writel(data, ioaddr + low); 238 writel(data, ioaddr + low);
247
248 return;
249} 239}
250 240
251void stmmac_get_mac_addr(unsigned long ioaddr, unsigned char *addr, 241void stmmac_get_mac_addr(unsigned long ioaddr, unsigned char *addr,
@@ -264,7 +254,5 @@ void stmmac_get_mac_addr(unsigned long ioaddr, unsigned char *addr,
264 addr[3] = (lo_addr >> 24) & 0xff; 254 addr[3] = (lo_addr >> 24) & 0xff;
265 addr[4] = hi_addr & 0xff; 255 addr[4] = hi_addr & 0xff;
266 addr[5] = (hi_addr >> 8) & 0xff; 256 addr[5] = (hi_addr >> 8) & 0xff;
267
268 return;
269} 257}
270 258
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/stmmac/enh_desc.c
index eb5684a1f713..3c18ebece043 100644
--- a/drivers/net/stmmac/enh_desc.c
+++ b/drivers/net/stmmac/enh_desc.c
@@ -241,7 +241,6 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, unsigned int ring_size,
241 p->des01.erx.disable_ic = 1; 241 p->des01.erx.disable_ic = 1;
242 p++; 242 p++;
243 } 243 }
244 return;
245} 244}
246 245
247static void enh_desc_init_tx_desc(struct dma_desc *p, unsigned int ring_size) 246static void enh_desc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
@@ -254,8 +253,6 @@ static void enh_desc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
254 p->des01.etx.end_ring = 1; 253 p->des01.etx.end_ring = 1;
255 p++; 254 p++;
256 } 255 }
257
258 return;
259} 256}
260 257
261static int enh_desc_get_tx_owner(struct dma_desc *p) 258static int enh_desc_get_tx_owner(struct dma_desc *p)
@@ -289,8 +286,6 @@ static void enh_desc_release_tx_desc(struct dma_desc *p)
289 286
290 memset(p, 0, sizeof(struct dma_desc)); 287 memset(p, 0, sizeof(struct dma_desc));
291 p->des01.etx.end_ring = ter; 288 p->des01.etx.end_ring = ter;
292
293 return;
294} 289}
295 290
296static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 291static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/stmmac/norm_desc.c
index ecfcc001a04a..31ad53643792 100644
--- a/drivers/net/stmmac/norm_desc.c
+++ b/drivers/net/stmmac/norm_desc.c
@@ -132,7 +132,6 @@ static void ndesc_init_rx_desc(struct dma_desc *p, unsigned int ring_size,
132 p->des01.rx.disable_ic = 1; 132 p->des01.rx.disable_ic = 1;
133 p++; 133 p++;
134 } 134 }
135 return;
136} 135}
137 136
138static void ndesc_init_tx_desc(struct dma_desc *p, unsigned int ring_size) 137static void ndesc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
@@ -144,7 +143,6 @@ static void ndesc_init_tx_desc(struct dma_desc *p, unsigned int ring_size)
144 p->des01.tx.end_ring = 1; 143 p->des01.tx.end_ring = 1;
145 p++; 144 p++;
146 } 145 }
147 return;
148} 146}
149 147
150static int ndesc_get_tx_owner(struct dma_desc *p) 148static int ndesc_get_tx_owner(struct dma_desc *p)
@@ -194,8 +192,6 @@ static void ndesc_release_tx_desc(struct dma_desc *p)
194 192
195 /* set termination field */ 193 /* set termination field */
196 p->des01.tx.end_ring = ter; 194 p->des01.tx.end_ring = ter;
197
198 return;
199} 195}
200 196
201static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 197static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c
index c021eaa3ca69..f080509923f0 100644
--- a/drivers/net/stmmac/stmmac_ethtool.c
+++ b/drivers/net/stmmac/stmmac_ethtool.c
@@ -102,7 +102,6 @@ void stmmac_ethtool_getdrvinfo(struct net_device *dev,
102 strcpy(info->version, DRV_MODULE_VERSION); 102 strcpy(info->version, DRV_MODULE_VERSION);
103 info->fw_version[0] = '\0'; 103 info->fw_version[0] = '\0';
104 info->n_stats = STMMAC_STATS_LEN; 104 info->n_stats = STMMAC_STATS_LEN;
105 return;
106} 105}
107 106
108int stmmac_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd) 107int stmmac_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -194,8 +193,6 @@ void stmmac_ethtool_gregs(struct net_device *dev,
194 reg_space[i + 55] = 193 reg_space[i + 55] =
195 readl(dev->base_addr + (DMA_BUS_MODE + (i * 4))); 194 readl(dev->base_addr + (DMA_BUS_MODE + (i * 4)));
196 } 195 }
197
198 return;
199} 196}
200 197
201int stmmac_ethtool_set_tx_csum(struct net_device *netdev, u32 data) 198int stmmac_ethtool_set_tx_csum(struct net_device *netdev, u32 data)
@@ -233,7 +230,6 @@ stmmac_get_pauseparam(struct net_device *netdev,
233 pause->tx_pause = 1; 230 pause->tx_pause = 1;
234 231
235 spin_unlock(&priv->lock); 232 spin_unlock(&priv->lock);
236 return;
237} 233}
238 234
239static int 235static int
@@ -292,8 +288,6 @@ static void stmmac_get_ethtool_stats(struct net_device *dev,
292 data[i] = (stmmac_gstrings_stats[i].sizeof_stat == 288 data[i] = (stmmac_gstrings_stats[i].sizeof_stat ==
293 sizeof(u64)) ? (*(u64 *)p) : (*(u32 *)p); 289 sizeof(u64)) ? (*(u64 *)p) : (*(u32 *)p);
294 } 290 }
295
296 return;
297} 291}
298 292
299static int stmmac_get_sset_count(struct net_device *netdev, int sset) 293static int stmmac_get_sset_count(struct net_device *netdev, int sset)
@@ -323,7 +317,6 @@ static void stmmac_get_strings(struct net_device *dev, u32 stringset, u8 *data)
323 WARN_ON(1); 317 WARN_ON(1);
324 break; 318 break;
325 } 319 }
326 return;
327} 320}
328 321
329/* Currently only support WOL through Magic packet. */ 322/* Currently only support WOL through Magic packet. */
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 7ac6ddea989e..a31d580f306d 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -169,8 +169,6 @@ static void stmmac_verify_args(void)
169 flow_ctrl = FLOW_OFF; 169 flow_ctrl = FLOW_OFF;
170 if (unlikely((pause < 0) || (pause > 0xffff))) 170 if (unlikely((pause < 0) || (pause > 0xffff)))
171 pause = PAUSE_TIME; 171 pause = PAUSE_TIME;
172
173 return;
174} 172}
175 173
176#if defined(STMMAC_XMIT_DEBUG) || defined(STMMAC_RX_DEBUG) 174#if defined(STMMAC_XMIT_DEBUG) || defined(STMMAC_RX_DEBUG)
@@ -184,7 +182,6 @@ static void print_pkt(unsigned char *buf, int len)
184 pr_info(" %02x", buf[j]); 182 pr_info(" %02x", buf[j]);
185 } 183 }
186 pr_info("\n"); 184 pr_info("\n");
187 return;
188} 185}
189#endif 186#endif
190 187
@@ -514,7 +511,6 @@ static void init_dma_desc_rings(struct net_device *dev)
514 pr_info("TX descriptor ring:\n"); 511 pr_info("TX descriptor ring:\n");
515 display_ring(priv->dma_tx, txsize); 512 display_ring(priv->dma_tx, txsize);
516 } 513 }
517 return;
518} 514}
519 515
520static void dma_free_rx_skbufs(struct stmmac_priv *priv) 516static void dma_free_rx_skbufs(struct stmmac_priv *priv)
@@ -529,7 +525,6 @@ static void dma_free_rx_skbufs(struct stmmac_priv *priv)
529 } 525 }
530 priv->rx_skbuff[i] = NULL; 526 priv->rx_skbuff[i] = NULL;
531 } 527 }
532 return;
533} 528}
534 529
535static void dma_free_tx_skbufs(struct stmmac_priv *priv) 530static void dma_free_tx_skbufs(struct stmmac_priv *priv)
@@ -547,7 +542,6 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv)
547 priv->tx_skbuff[i] = NULL; 542 priv->tx_skbuff[i] = NULL;
548 } 543 }
549 } 544 }
550 return;
551} 545}
552 546
553static void free_dma_desc_resources(struct stmmac_priv *priv) 547static void free_dma_desc_resources(struct stmmac_priv *priv)
@@ -567,8 +561,6 @@ static void free_dma_desc_resources(struct stmmac_priv *priv)
567 kfree(priv->rx_skbuff_dma); 561 kfree(priv->rx_skbuff_dma);
568 kfree(priv->rx_skbuff); 562 kfree(priv->rx_skbuff);
569 kfree(priv->tx_skbuff); 563 kfree(priv->tx_skbuff);
570
571 return;
572} 564}
573 565
574/** 566/**
@@ -598,8 +590,6 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
598 } 590 }
599 } 591 }
600 tx_coe = priv->tx_coe; 592 tx_coe = priv->tx_coe;
601
602 return;
603} 593}
604 594
605/** 595/**
@@ -675,7 +665,6 @@ static void stmmac_tx(struct stmmac_priv *priv)
675 } 665 }
676 netif_tx_unlock(priv->dev); 666 netif_tx_unlock(priv->dev);
677 } 667 }
678 return;
679} 668}
680 669
681static inline void stmmac_enable_irq(struct stmmac_priv *priv) 670static inline void stmmac_enable_irq(struct stmmac_priv *priv)
@@ -731,8 +720,6 @@ void stmmac_schedule(struct net_device *dev)
731 priv->xstats.sched_timer_n++; 720 priv->xstats.sched_timer_n++;
732 721
733 _stmmac_schedule(priv); 722 _stmmac_schedule(priv);
734
735 return;
736} 723}
737 724
738static void stmmac_no_timer_started(unsigned int x) 725static void stmmac_no_timer_started(unsigned int x)
@@ -763,8 +750,6 @@ static void stmmac_tx_err(struct stmmac_priv *priv)
763 750
764 priv->dev->stats.tx_errors++; 751 priv->dev->stats.tx_errors++;
765 netif_wake_queue(priv->dev); 752 netif_wake_queue(priv->dev);
766
767 return;
768} 753}
769 754
770 755
@@ -788,8 +773,6 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv)
788 stmmac_tx_err(priv); 773 stmmac_tx_err(priv);
789 } else if (unlikely(status == tx_hard_error)) 774 } else if (unlikely(status == tx_hard_error))
790 stmmac_tx_err(priv); 775 stmmac_tx_err(priv);
791
792 return;
793} 776}
794 777
795/** 778/**
@@ -1197,7 +1180,6 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
1197 } 1180 }
1198 priv->hw->desc->set_rx_owner(p + entry); 1181 priv->hw->desc->set_rx_owner(p + entry);
1199 } 1182 }
1200 return;
1201} 1183}
1202 1184
1203static int stmmac_rx(struct stmmac_priv *priv, int limit) 1185static int stmmac_rx(struct stmmac_priv *priv, int limit)
@@ -1331,7 +1313,6 @@ static void stmmac_tx_timeout(struct net_device *dev)
1331 1313
1332 /* Clear Tx resources and restart transmitting again */ 1314 /* Clear Tx resources and restart transmitting again */
1333 stmmac_tx_err(priv); 1315 stmmac_tx_err(priv);
1334 return;
1335} 1316}
1336 1317
1337/* Configuration changes (passed on by ifconfig) */ 1318/* Configuration changes (passed on by ifconfig) */
@@ -1373,7 +1354,6 @@ static void stmmac_multicast_list(struct net_device *dev)
1373 spin_lock(&priv->lock); 1354 spin_lock(&priv->lock);
1374 priv->hw->mac->set_filter(dev); 1355 priv->hw->mac->set_filter(dev);
1375 spin_unlock(&priv->lock); 1356 spin_unlock(&priv->lock);
1376 return;
1377} 1357}
1378 1358
1379/** 1359/**
@@ -1489,8 +1469,6 @@ static void stmmac_vlan_rx_register(struct net_device *dev,
1489 spin_lock(&priv->lock); 1469 spin_lock(&priv->lock);
1490 priv->vlgrp = grp; 1470 priv->vlgrp = grp;
1491 spin_unlock(&priv->lock); 1471 spin_unlock(&priv->lock);
1492
1493 return;
1494} 1472}
1495#endif 1473#endif
1496 1474
diff --git a/drivers/net/stmmac/stmmac_timer.c b/drivers/net/stmmac/stmmac_timer.c
index 679f61ffb1f8..2a0e1abde7e7 100644
--- a/drivers/net/stmmac/stmmac_timer.c
+++ b/drivers/net/stmmac/stmmac_timer.c
@@ -31,8 +31,6 @@ static void stmmac_timer_handler(void *data)
31 struct net_device *dev = (struct net_device *)data; 31 struct net_device *dev = (struct net_device *)data;
32 32
33 stmmac_schedule(dev); 33 stmmac_schedule(dev);
34
35 return;
36} 34}
37 35
38#define STMMAC_TIMER_MSG(timer, freq) \ 36#define STMMAC_TIMER_MSG(timer, freq) \
@@ -47,13 +45,11 @@ static void stmmac_rtc_start(unsigned int new_freq)
47{ 45{
48 rtc_irq_set_freq(stmmac_rtc, &stmmac_task, new_freq); 46 rtc_irq_set_freq(stmmac_rtc, &stmmac_task, new_freq);
49 rtc_irq_set_state(stmmac_rtc, &stmmac_task, 1); 47 rtc_irq_set_state(stmmac_rtc, &stmmac_task, 1);
50 return;
51} 48}
52 49
53static void stmmac_rtc_stop(void) 50static void stmmac_rtc_stop(void)
54{ 51{
55 rtc_irq_set_state(stmmac_rtc, &stmmac_task, 0); 52 rtc_irq_set_state(stmmac_rtc, &stmmac_task, 0);
56 return;
57} 53}
58 54
59int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm) 55int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
@@ -102,13 +98,11 @@ static void stmmac_tmu_start(unsigned int new_freq)
102{ 98{
103 clk_set_rate(timer_clock, new_freq); 99 clk_set_rate(timer_clock, new_freq);
104 clk_enable(timer_clock); 100 clk_enable(timer_clock);
105 return;
106} 101}
107 102
108static void stmmac_tmu_stop(void) 103static void stmmac_tmu_stop(void)
109{ 104{
110 clk_disable(timer_clock); 105 clk_disable(timer_clock);
111 return;
112} 106}
113 107
114int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm) 108int stmmac_open_ext_timer(struct net_device *dev, struct stmmac_timer *tm)
diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c
index 87a6b8eabc67..d85f0a84bc7b 100644
--- a/drivers/net/stnic.c
+++ b/drivers/net/stnic.c
@@ -280,7 +280,6 @@ stnic_init (struct net_device *dev)
280{ 280{
281 stnic_reset (dev); 281 stnic_reset (dev);
282 NS8390_init (dev, 0); 282 NS8390_init (dev, 0);
283 return;
284} 283}
285 284
286static void __exit stnic_cleanup(void) 285static void __exit stnic_cleanup(void)
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 16803251a999..2678588ea4b2 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -788,7 +788,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
788 iowrite8(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr); 788 iowrite8(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr);
789 mdio_delay(); 789 mdio_delay();
790 } 790 }
791 return;
792} 791}
793 792
794static int mdio_wait_link(struct net_device *dev, int wait) 793static int mdio_wait_link(struct net_device *dev, int wait)
@@ -1022,7 +1021,6 @@ static void init_ring(struct net_device *dev)
1022 np->tx_skbuff[i] = NULL; 1021 np->tx_skbuff[i] = NULL;
1023 np->tx_ring[i].status = 0; 1022 np->tx_ring[i].status = 0;
1024 } 1023 }
1025 return;
1026} 1024}
1027 1025
1028static void tx_poll (unsigned long data) 1026static void tx_poll (unsigned long data)
@@ -1049,7 +1047,6 @@ static void tx_poll (unsigned long data)
1049 if (ioread32 (np->base + TxListPtr) == 0) 1047 if (ioread32 (np->base + TxListPtr) == 0)
1050 iowrite32 (np->tx_ring_dma + head * sizeof(struct netdev_desc), 1048 iowrite32 (np->tx_ring_dma + head * sizeof(struct netdev_desc),
1051 np->base + TxListPtr); 1049 np->base + TxListPtr);
1052 return;
1053} 1050}
1054 1051
1055static netdev_tx_t 1052static netdev_tx_t
@@ -1378,7 +1375,6 @@ not_done:
1378 if (np->budget <= 0) 1375 if (np->budget <= 0)
1379 np->budget = RX_BUDGET; 1376 np->budget = RX_BUDGET;
1380 tasklet_schedule(&np->rx_tasklet); 1377 tasklet_schedule(&np->rx_tasklet);
1381 return;
1382} 1378}
1383 1379
1384static void refill_rx (struct net_device *dev) 1380static void refill_rx (struct net_device *dev)
@@ -1409,7 +1405,6 @@ static void refill_rx (struct net_device *dev)
1409 np->rx_ring[entry].status = 0; 1405 np->rx_ring[entry].status = 0;
1410 cnt++; 1406 cnt++;
1411 } 1407 }
1412 return;
1413} 1408}
1414static void netdev_error(struct net_device *dev, int intr_status) 1409static void netdev_error(struct net_device *dev, int intr_status)
1415{ 1410{
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 5bc786f73e4d..434f9d735333 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2923,7 +2923,6 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
2923 dev_addr[1] = 0x00; 2923 dev_addr[1] = 0x00;
2924 dev_addr[2] = 0x20; 2924 dev_addr[2] = 0x20;
2925 get_random_bytes(dev_addr + 3, 3); 2925 get_random_bytes(dev_addr + 3, 3);
2926 return;
2927} 2926}
2928#endif /* not Sparc and not PPC */ 2927#endif /* not Sparc and not PPC */
2929 2928
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 377c0b51e559..30826eba1a53 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2943,7 +2943,6 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
2943 dev_addr[1] = 0x00; 2943 dev_addr[1] = 0x00;
2944 dev_addr[2] = 0x20; 2944 dev_addr[2] = 0x20;
2945 get_random_bytes(&dev_addr[3], 3); 2945 get_random_bytes(&dev_addr[3], 3);
2946 return;
2947} 2946}
2948#endif /* !(CONFIG_SPARC) */ 2947#endif /* !(CONFIG_SPARC) */
2949 2948
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)
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 213b9affc22a..0929fff5982c 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -5147,8 +5147,6 @@ static void smctr_set_multicast_list(struct net_device *dev)
5147{ 5147{
5148 if(smctr_debug > 10) 5148 if(smctr_debug > 10)
5149 printk(KERN_DEBUG "%s: smctr_set_multicast_list\n", dev->name); 5149 printk(KERN_DEBUG "%s: smctr_set_multicast_list\n", dev->name);
5150
5151 return;
5152} 5150}
5153 5151
5154static int smctr_set_page(struct net_device *dev, __u8 *buf) 5152static int smctr_set_page(struct net_device *dev, __u8 *buf)
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 8cb126a80070..435ef7d5470f 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -325,8 +325,6 @@ static void tms380tr_timer_end_wait(unsigned long data)
325 tp->Sleeping = 0; 325 tp->Sleeping = 0;
326 wake_up_interruptible(&tp->wait_for_tok_int); 326 wake_up_interruptible(&tp->wait_for_tok_int);
327 } 327 }
328
329 return;
330} 328}
331 329
332/* 330/*
@@ -460,8 +458,6 @@ static void tms380tr_init_net_local(struct net_device *dev)
460 tp->RplHead = &tp->Rpl[0]; 458 tp->RplHead = &tp->Rpl[0];
461 tp->RplTail = &tp->Rpl[RPL_NUM-1]; 459 tp->RplTail = &tp->Rpl[RPL_NUM-1];
462 tp->RplTail->Status = (RX_START_FRAME | RX_END_FRAME | RX_FRAME_IRQ); 460 tp->RplTail->Status = (RX_START_FRAME | RX_END_FRAME | RX_FRAME_IRQ);
463
464 return;
465} 461}
466 462
467/* 463/*
@@ -481,8 +477,6 @@ static void tms380tr_init_ipb(struct net_local *tp)
481 tp->ipb.DMA_Abort_Thrhld = DMA_RETRIES; 477 tp->ipb.DMA_Abort_Thrhld = DMA_RETRIES;
482 tp->ipb.SCB_Addr = 0; 478 tp->ipb.SCB_Addr = 0;
483 tp->ipb.SSB_Addr = 0; 479 tp->ipb.SSB_Addr = 0;
484
485 return;
486} 480}
487 481
488/* 482/*
@@ -527,8 +521,6 @@ static void tms380tr_init_opb(struct net_device *dev)
527 521
528 tp->ocpl.ProdIDAddr[0] = LOWORD(Addr); 522 tp->ocpl.ProdIDAddr[0] = LOWORD(Addr);
529 tp->ocpl.ProdIDAddr[1] = HIWORD(Addr); 523 tp->ocpl.ProdIDAddr[1] = HIWORD(Addr);
530
531 return;
532} 524}
533 525
534/* 526/*
@@ -543,8 +535,6 @@ static void tms380tr_open_adapter(struct net_device *dev)
543 535
544 tp->OpenCommandIssued = 1; 536 tp->OpenCommandIssued = 1;
545 tms380tr_exec_cmd(dev, OC_OPEN); 537 tms380tr_exec_cmd(dev, OC_OPEN);
546
547 return;
548} 538}
549 539
550/* 540/*
@@ -554,8 +544,6 @@ static void tms380tr_open_adapter(struct net_device *dev)
554static void tms380tr_disable_interrupts(struct net_device *dev) 544static void tms380tr_disable_interrupts(struct net_device *dev)
555{ 545{
556 SIFWRITEB(0, SIFACL); 546 SIFWRITEB(0, SIFACL);
557
558 return;
559} 547}
560 548
561/* 549/*
@@ -565,8 +553,6 @@ static void tms380tr_disable_interrupts(struct net_device *dev)
565static void tms380tr_enable_interrupts(struct net_device *dev) 553static void tms380tr_enable_interrupts(struct net_device *dev)
566{ 554{
567 SIFWRITEB(ACL_SINTEN, SIFACL); 555 SIFWRITEB(ACL_SINTEN, SIFACL);
568
569 return;
570} 556}
571 557
572/* 558/*
@@ -578,8 +564,6 @@ static void tms380tr_exec_cmd(struct net_device *dev, unsigned short Command)
578 564
579 tp->CMDqueue |= Command; 565 tp->CMDqueue |= Command;
580 tms380tr_chk_outstanding_cmds(dev); 566 tms380tr_chk_outstanding_cmds(dev);
581
582 return;
583} 567}
584 568
585static void tms380tr_timeout(struct net_device *dev) 569static void tms380tr_timeout(struct net_device *dev)
@@ -712,8 +696,6 @@ static void tms380tr_chk_src_addr(unsigned char *frame, unsigned char *hw_addr)
712 SRBit = frame[8] & 0x80; 696 SRBit = frame[8] & 0x80;
713 memcpy(&frame[8], hw_addr, 6); 697 memcpy(&frame[8], hw_addr, 6);
714 frame[8] |= SRBit; 698 frame[8] |= SRBit;
715
716 return;
717} 699}
718 700
719/* 701/*
@@ -743,8 +725,6 @@ static void tms380tr_timer_chk(unsigned long data)
743 return; 725 return;
744 tp->ReOpenInProgress = 1; 726 tp->ReOpenInProgress = 1;
745 tms380tr_open_adapter(dev); 727 tms380tr_open_adapter(dev);
746
747 return;
748} 728}
749 729
750/* 730/*
@@ -863,8 +843,6 @@ static void tms380tr_reset_interrupt(struct net_device *dev)
863 * and clear STS_SYSTEM_IRQ bit: enable adapter for further interrupts. 843 * and clear STS_SYSTEM_IRQ bit: enable adapter for further interrupts.
864 */ 844 */
865 tms380tr_exec_sifcmd(dev, CMD_SSB_CLEAR | CMD_CLEAR_SYSTEM_IRQ); 845 tms380tr_exec_sifcmd(dev, CMD_SSB_CLEAR | CMD_CLEAR_SYSTEM_IRQ);
866
867 return;
868} 846}
869 847
870/* 848/*
@@ -1119,8 +1097,6 @@ static void tms380tr_cmd_status_irq(struct net_device *dev)
1119 tp->MacStat.frequency_errors += tp->errorlogtable.Frequency_Error; 1097 tp->MacStat.frequency_errors += tp->errorlogtable.Frequency_Error;
1120 tp->MacStat.internal_errors += tp->errorlogtable.Internal_Error; 1098 tp->MacStat.internal_errors += tp->errorlogtable.Internal_Error;
1121 } 1099 }
1122
1123 return;
1124} 1100}
1125 1101
1126/* 1102/*
@@ -1229,7 +1205,6 @@ static void tms380tr_set_multicast_list(struct net_device *dev)
1229 1205
1230 tp->ocpl.OPENOptions = OpenOptions; 1206 tp->ocpl.OPENOptions = OpenOptions;
1231 tms380tr_exec_cmd(dev, OC_MODIFY_OPEN_PARMS); 1207 tms380tr_exec_cmd(dev, OC_MODIFY_OPEN_PARMS);
1232 return;
1233} 1208}
1234 1209
1235/* 1210/*
@@ -1247,7 +1222,6 @@ void tms380tr_wait(unsigned long time)
1247#else 1222#else
1248 udelay(time); 1223 udelay(time);
1249#endif 1224#endif
1250 return;
1251} 1225}
1252 1226
1253/* 1227/*
@@ -1266,8 +1240,6 @@ static void tms380tr_exec_sifcmd(struct net_device *dev, unsigned int WriteValue
1266 SifStsValue = SIFREADW(SIFSTS); 1240 SifStsValue = SIFREADW(SIFSTS);
1267 } while((SifStsValue & CMD_INTERRUPT_ADAPTER) && loop_counter--); 1241 } while((SifStsValue & CMD_INTERRUPT_ADAPTER) && loop_counter--);
1268 SIFWRITEW(cmd, SIFCMD); 1242 SIFWRITEW(cmd, SIFCMD);
1269
1270 return;
1271} 1243}
1272 1244
1273/* 1245/*
@@ -1700,8 +1672,6 @@ static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
1700 1672
1701 /* Execute SCB and generate IRQ when done. */ 1673 /* Execute SCB and generate IRQ when done. */
1702 tms380tr_exec_sifcmd(dev, CMD_EXECUTE | CMD_SCB_REQUEST); 1674 tms380tr_exec_sifcmd(dev, CMD_EXECUTE | CMD_SCB_REQUEST);
1703
1704 return;
1705} 1675}
1706 1676
1707/* 1677/*
@@ -1774,8 +1744,6 @@ static void tms380tr_ring_status_irq(struct net_device *dev)
1774 tp->AdapterOpenFlag = 0; 1744 tp->AdapterOpenFlag = 0;
1775 tms380tr_open_adapter(dev); 1745 tms380tr_open_adapter(dev);
1776 } 1746 }
1777
1778 return;
1779} 1747}
1780 1748
1781/* 1749/*
@@ -1932,8 +1900,6 @@ static void tms380tr_chk_irq(struct net_device *dev)
1932 /* Restart of firmware successful */ 1900 /* Restart of firmware successful */
1933 tp->AdapterOpenFlag = 1; 1901 tp->AdapterOpenFlag = 1;
1934 } 1902 }
1935
1936 return;
1937} 1903}
1938 1904
1939/* 1905/*
@@ -1988,8 +1954,6 @@ static void tms380tr_read_ram(struct net_device *dev, unsigned char *Data,
1988 /* Restore original values */ 1954 /* Restore original values */
1989 SIFWRITEW(old_sifadx, SIFADX); 1955 SIFWRITEW(old_sifadx, SIFADX);
1990 SIFWRITEW(old_sifadr, SIFADR); 1956 SIFWRITEW(old_sifadr, SIFADR);
1991
1992 return;
1993} 1957}
1994 1958
1995/* 1959/*
@@ -2021,8 +1985,6 @@ static void tms380tr_cancel_tx_queue(struct net_local* tp)
2021 dma_unmap_single(tp->pdev, tpl->DMABuff, tpl->Skb->len, DMA_TO_DEVICE); 1985 dma_unmap_single(tp->pdev, tpl->DMABuff, tpl->Skb->len, DMA_TO_DEVICE);
2022 dev_kfree_skb_any(tpl->Skb); 1986 dev_kfree_skb_any(tpl->Skb);
2023 } 1987 }
2024
2025 return;
2026} 1988}
2027 1989
2028/* 1990/*
@@ -2094,7 +2056,6 @@ static void tms380tr_tx_status_irq(struct net_device *dev)
2094 2056
2095 if(!tp->TplFree->NextTPLPtr->BusyFlag) 2057 if(!tp->TplFree->NextTPLPtr->BusyFlag)
2096 netif_wake_queue(dev); 2058 netif_wake_queue(dev);
2097 return;
2098} 2059}
2099 2060
2100/* 2061/*
@@ -2255,8 +2216,6 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
2255 /* Inform adapter about RPL valid. */ 2216 /* Inform adapter about RPL valid. */
2256 tms380tr_exec_sifcmd(dev, CMD_RX_VALID); 2217 tms380tr_exec_sifcmd(dev, CMD_RX_VALID);
2257 } 2218 }
2258
2259 return;
2260} 2219}
2261 2220
2262/* 2221/*
@@ -2269,8 +2228,6 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
2269static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status) 2228static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status)
2270{ 2229{
2271 rpl->Status = Status; 2230 rpl->Status = Status;
2272
2273 return;
2274} 2231}
2275 2232
2276/* 2233/*
@@ -2287,8 +2244,6 @@ static void tms380tr_update_rcv_stats(struct net_local *tp, unsigned char DataPt
2287 /* Test functional bit */ 2244 /* Test functional bit */
2288 if(DataPtr[2] & GROUP_BIT) 2245 if(DataPtr[2] & GROUP_BIT)
2289 tp->MacStat.multicast++; 2246 tp->MacStat.multicast++;
2290
2291 return;
2292} 2247}
2293 2248
2294static int tms380tr_set_mac_address(struct net_device *dev, void *addr) 2249static int tms380tr_set_mac_address(struct net_device *dev, void *addr)
@@ -2318,8 +2273,6 @@ static void tms380tr_dump(unsigned char *Data, int length)
2318 Data[j+0],Data[j+1],Data[j+2],Data[j+3], 2273 Data[j+0],Data[j+1],Data[j+2],Data[j+3],
2319 Data[j+4],Data[j+5],Data[j+6],Data[j+7]); 2274 Data[j+4],Data[j+5],Data[j+6],Data[j+7]);
2320 } 2275 }
2321
2322 return;
2323} 2276}
2324#endif 2277#endif
2325 2278
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 9522baf8d997..75a64c88cf7a 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1883,8 +1883,6 @@ de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len)
1883 if (lp->pktStats.bins[0] == 0) { /* Reset counters */ 1883 if (lp->pktStats.bins[0] == 0) { /* Reset counters */
1884 memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats)); 1884 memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats));
1885 } 1885 }
1886
1887 return;
1888} 1886}
1889 1887
1890/* 1888/*
@@ -1991,8 +1989,6 @@ SetMulticastFilter(struct net_device *dev)
1991 } 1989 }
1992 } 1990 }
1993 outl(omr, DE4X5_OMR); 1991 outl(omr, DE4X5_OMR);
1994
1995 return;
1996} 1992}
1997 1993
1998#ifdef CONFIG_EISA 1994#ifdef CONFIG_EISA
@@ -2187,8 +2183,6 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
2187 return; 2183 return;
2188 } 2184 }
2189 } 2185 }
2190
2191 return;
2192} 2186}
2193 2187
2194/* 2188/*
@@ -3291,8 +3285,6 @@ de4x5_init_connection(struct net_device *dev)
3291 outl(POLL_DEMAND, DE4X5_TPD); 3285 outl(POLL_DEMAND, DE4X5_TPD);
3292 3286
3293 netif_wake_queue(dev); 3287 netif_wake_queue(dev);
3294
3295 return;
3296} 3288}
3297 3289
3298/* 3290/*
@@ -3664,8 +3656,6 @@ de4x5_free_rx_buffs(struct net_device *dev)
3664 lp->rx_ring[i].status = 0; 3656 lp->rx_ring[i].status = 0;
3665 lp->rx_skb[i] = (struct sk_buff *)1; /* Dummy entry */ 3657 lp->rx_skb[i] = (struct sk_buff *)1; /* Dummy entry */
3666 } 3658 }
3667
3668 return;
3669} 3659}
3670 3660
3671static void 3661static void
@@ -3708,8 +3698,6 @@ de4x5_save_skbs(struct net_device *dev)
3708 lp->cache.save_cnt++; 3698 lp->cache.save_cnt++;
3709 START_DE4X5; 3699 START_DE4X5;
3710 } 3700 }
3711
3712 return;
3713} 3701}
3714 3702
3715static void 3703static void
@@ -3741,8 +3729,6 @@ de4x5_rst_desc_ring(struct net_device *dev)
3741 lp->cache.save_cnt--; 3729 lp->cache.save_cnt--;
3742 START_DE4X5; 3730 START_DE4X5;
3743 } 3731 }
3744
3745 return;
3746} 3732}
3747 3733
3748static void 3734static void
@@ -3771,8 +3757,6 @@ de4x5_cache_state(struct net_device *dev, int flag)
3771 } 3757 }
3772 break; 3758 break;
3773 } 3759 }
3774
3775 return;
3776} 3760}
3777 3761
3778static void 3762static void
@@ -3845,8 +3829,6 @@ de4x5_setup_intr(struct net_device *dev)
3845 outl(sts, DE4X5_STS); 3829 outl(sts, DE4X5_STS);
3846 ENABLE_IRQs; 3830 ENABLE_IRQs;
3847 } 3831 }
3848
3849 return;
3850} 3832}
3851 3833
3852/* 3834/*
@@ -3879,8 +3861,6 @@ reset_init_sia(struct net_device *dev, s32 csr13, s32 csr14, s32 csr15)
3879 outl(csr13, DE4X5_SICR); 3861 outl(csr13, DE4X5_SICR);
3880 3862
3881 mdelay(10); 3863 mdelay(10);
3882
3883 return;
3884} 3864}
3885 3865
3886/* 3866/*
@@ -3901,8 +3881,6 @@ create_packet(struct net_device *dev, char *frame, int len)
3901 3881
3902 *buf++ = 0; /* Packet length (2 bytes) */ 3882 *buf++ = 0; /* Packet length (2 bytes) */
3903 *buf++ = 1; 3883 *buf++ = 1;
3904
3905 return;
3906} 3884}
3907 3885
3908/* 3886/*
@@ -4006,8 +3984,6 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)
4006 } 3984 }
4007 de4x5_dbg_srom((struct de4x5_srom *)&lp->srom); 3985 de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
4008 } 3986 }
4009
4010 return;
4011} 3987}
4012 3988
4013/* 3989/*
@@ -4045,8 +4021,6 @@ enet_addr_rst(u_long aprom_addr)
4045 } 4021 }
4046 } 4022 }
4047 } 4023 }
4048
4049 return;
4050} 4024}
4051 4025
4052/* 4026/*
@@ -4186,8 +4160,6 @@ srom_repair(struct net_device *dev, int card)
4186 lp->useSROM = true; 4160 lp->useSROM = true;
4187 break; 4161 break;
4188 } 4162 }
4189
4190 return;
4191} 4163}
4192 4164
4193/* 4165/*
@@ -4261,8 +4233,6 @@ srom_latch(u_int command, u_long addr)
4261 sendto_srom(command, addr); 4233 sendto_srom(command, addr);
4262 sendto_srom(command | DT_CLK, addr); 4234 sendto_srom(command | DT_CLK, addr);
4263 sendto_srom(command, addr); 4235 sendto_srom(command, addr);
4264
4265 return;
4266} 4236}
4267 4237
4268static void 4238static void
@@ -4271,8 +4241,6 @@ srom_command(u_int command, u_long addr)
4271 srom_latch(command, addr); 4241 srom_latch(command, addr);
4272 srom_latch(command, addr); 4242 srom_latch(command, addr);
4273 srom_latch((command & 0x0000ff00) | DT_CS, addr); 4243 srom_latch((command & 0x0000ff00) | DT_CS, addr);
4274
4275 return;
4276} 4244}
4277 4245
4278static void 4246static void
@@ -4287,8 +4255,6 @@ srom_address(u_int command, u_long addr, u_char offset)
4287 udelay(1); 4255 udelay(1);
4288 4256
4289 i = (getfrom_srom(addr) >> 3) & 0x01; 4257 i = (getfrom_srom(addr) >> 3) & 0x01;
4290
4291 return;
4292} 4258}
4293 4259
4294static short 4260static short
@@ -4322,8 +4288,6 @@ srom_busy(u_int command, u_long addr)
4322 } 4288 }
4323 4289
4324 sendto_srom(command & 0x0000ff00, addr); 4290 sendto_srom(command & 0x0000ff00, addr);
4325
4326 return;
4327} 4291}
4328*/ 4292*/
4329 4293
@@ -4332,8 +4296,6 @@ sendto_srom(u_int command, u_long addr)
4332{ 4296{
4333 outl(command, addr); 4297 outl(command, addr);
4334 udelay(1); 4298 udelay(1);
4335
4336 return;
4337} 4299}
4338 4300
4339static int 4301static int
@@ -4432,8 +4394,6 @@ srom_init(struct net_device *dev)
4432 p += ((*p & BLOCK_LEN) + 1); 4394 p += ((*p & BLOCK_LEN) + 1);
4433 } 4395 }
4434 } 4396 }
4435
4436 return;
4437} 4397}
4438 4398
4439/* 4399/*
@@ -4462,8 +4422,6 @@ srom_exec(struct net_device *dev, u_char *p)
4462 outl(lp->cache.csr14, DE4X5_STRR); 4422 outl(lp->cache.csr14, DE4X5_STRR);
4463 outl(lp->cache.csr13, DE4X5_SICR); 4423 outl(lp->cache.csr13, DE4X5_SICR);
4464 } 4424 }
4465
4466 return;
4467} 4425}
4468 4426
4469/* 4427/*
@@ -4888,8 +4846,6 @@ mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr)
4888 mii_ta(MII_STWR, ioaddr); /* Turn around time - 2 MDC */ 4846 mii_ta(MII_STWR, ioaddr); /* Turn around time - 2 MDC */
4889 data = mii_swap(data, 16); /* Swap data bit ordering */ 4847 data = mii_swap(data, 16); /* Swap data bit ordering */
4890 mii_wdata(data, 16, ioaddr); /* Write data */ 4848 mii_wdata(data, 16, ioaddr); /* Write data */
4891
4892 return;
4893} 4849}
4894 4850
4895static int 4851static int
@@ -4915,8 +4871,6 @@ mii_wdata(int data, int len, u_long ioaddr)
4915 sendto_mii(MII_MWR | MII_WR, data, ioaddr); 4871 sendto_mii(MII_MWR | MII_WR, data, ioaddr);
4916 data >>= 1; 4872 data >>= 1;
4917 } 4873 }
4918
4919 return;
4920} 4874}
4921 4875
4922static void 4876static void
@@ -4929,8 +4883,6 @@ mii_address(u_char addr, u_long ioaddr)
4929 sendto_mii(MII_MWR | MII_WR, addr, ioaddr); 4883 sendto_mii(MII_MWR | MII_WR, addr, ioaddr);
4930 addr >>= 1; 4884 addr >>= 1;
4931 } 4885 }
4932
4933 return;
4934} 4886}
4935 4887
4936static void 4888static void
@@ -4942,8 +4894,6 @@ mii_ta(u_long rw, u_long ioaddr)
4942 } else { 4894 } else {
4943 getfrom_mii(MII_MRD | MII_RD, ioaddr); /* Tri-state MDIO */ 4895 getfrom_mii(MII_MRD | MII_RD, ioaddr); /* Tri-state MDIO */
4944 } 4896 }
4945
4946 return;
4947} 4897}
4948 4898
4949static int 4899static int
@@ -4970,8 +4920,6 @@ sendto_mii(u32 command, int data, u_long ioaddr)
4970 udelay(1); 4920 udelay(1);
4971 outl(command | MII_MDC | j, ioaddr); 4921 outl(command | MII_MDC | j, ioaddr);
4972 udelay(1); 4922 udelay(1);
4973
4974 return;
4975} 4923}
4976 4924
4977static int 4925static int
@@ -5185,8 +5133,6 @@ gep_wr(s32 data, struct net_device *dev)
5185 } else if ((lp->chipset & ~0x00ff) == DC2114x) { 5133 } else if ((lp->chipset & ~0x00ff) == DC2114x) {
5186 outl((data<<16) | lp->cache.csr15, DE4X5_SIGR); 5134 outl((data<<16) | lp->cache.csr15, DE4X5_SIGR);
5187 } 5135 }
5188
5189 return;
5190} 5136}
5191 5137
5192static int 5138static int
@@ -5246,8 +5192,6 @@ yawn(struct net_device *dev, int state)
5246 break; 5192 break;
5247 } 5193 }
5248 } 5194 }
5249
5250 return;
5251} 5195}
5252 5196
5253static void 5197static void
@@ -5289,8 +5233,6 @@ de4x5_parse_params(struct net_device *dev)
5289 } 5233 }
5290 *q = t; 5234 *q = t;
5291 } 5235 }
5292
5293 return;
5294} 5236}
5295 5237
5296static void 5238static void
@@ -5340,8 +5282,6 @@ de4x5_dbg_open(struct net_device *dev)
5340 (short)lp->rxRingSize, 5282 (short)lp->rxRingSize,
5341 (short)lp->txRingSize); 5283 (short)lp->txRingSize);
5342 } 5284 }
5343
5344 return;
5345} 5285}
5346 5286
5347static void 5287static void
@@ -5368,8 +5308,6 @@ de4x5_dbg_mii(struct net_device *dev, int k)
5368 printk("MII 20: %x\n",mii_rd(0x14,lp->phy[k].addr,DE4X5_MII)); 5308 printk("MII 20: %x\n",mii_rd(0x14,lp->phy[k].addr,DE4X5_MII));
5369 } 5309 }
5370 } 5310 }
5371
5372 return;
5373} 5311}
5374 5312
5375static void 5313static void
@@ -5394,8 +5332,6 @@ de4x5_dbg_media(struct net_device *dev)
5394 } 5332 }
5395 lp->c_media = lp->media; 5333 lp->c_media = lp->media;
5396 } 5334 }
5397
5398 return;
5399} 5335}
5400 5336
5401static void 5337static void
@@ -5416,8 +5352,6 @@ de4x5_dbg_srom(struct de4x5_srom *p)
5416 printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i)); 5352 printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i));
5417 } 5353 }
5418 } 5354 }
5419
5420 return;
5421} 5355}
5422 5356
5423static void 5357static void
@@ -5439,8 +5373,6 @@ de4x5_dbg_rx(struct sk_buff *skb, int len)
5439 printk("\n"); 5373 printk("\n");
5440 } 5374 }
5441 } 5375 }
5442
5443 return;
5444} 5376}
5445 5377
5446/* 5378/*
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index bdb25b8b1017..29e6c63d39fd 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1118,7 +1118,6 @@ static void dmfe_ethtool_get_wol(struct net_device *dev,
1118 1118
1119 wolinfo->supported = WAKE_PHY | WAKE_MAGIC; 1119 wolinfo->supported = WAKE_PHY | WAKE_MAGIC;
1120 wolinfo->wolopts = db->wol_mode; 1120 wolinfo->wolopts = db->wol_mode;
1121 return;
1122} 1121}
1123 1122
1124 1123
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index 68b170ae4d15..a0c770ee4b64 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -396,8 +396,6 @@ void tulip_select_media(struct net_device *dev, int startup)
396 tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0); 396 tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
397 397
398 mdelay(1); 398 mdelay(1);
399
400 return;
401} 399}
402 400
403/* 401/*
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 60a87542f8f0..608b279b921b 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -626,7 +626,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
626 iowrite32(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr); 626 iowrite32(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr);
627 mdio_delay(mdio_addr); 627 mdio_delay(mdio_addr);
628 } 628 }
629 return;
630} 629}
631 630
632 631
@@ -971,7 +970,6 @@ static void tx_timeout(struct net_device *dev)
971 netif_wake_queue(dev); 970 netif_wake_queue(dev);
972 dev->trans_start = jiffies; /* prevent tx timeout */ 971 dev->trans_start = jiffies; /* prevent tx timeout */
973 np->stats.tx_errors++; 972 np->stats.tx_errors++;
974 return;
975} 973}
976 974
977/* Initialize the Rx and Tx rings, along with various 'dev' bits. */ 975/* Initialize the Rx and Tx rings, along with various 'dev' bits. */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index dbdfb1ff7ca0..01b5cfcfa870 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -417,7 +417,6 @@ static void tun_net_mclist(struct net_device *dev)
417 * _rx_ path and has nothing to do with the _tx_ path. 417 * _rx_ path and has nothing to do with the _tx_ path.
418 * In rx path we always accept everything userspace gives us. 418 * In rx path we always accept everything userspace gives us.
419 */ 419 */
420 return;
421} 420}
422 421
423#define MIN_MTU 68 422#define MIN_MTU 68
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index a6227f892d1b..9964df199511 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1472,7 +1472,6 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
1472 spin_unlock_irqrestore(&serial->serial_lock, flags); 1472 spin_unlock_irqrestore(&serial->serial_lock, flags);
1473 1473
1474 /* done */ 1474 /* done */
1475 return;
1476} 1475}
1477 1476
1478/* how many characters in the buffer */ 1477/* how many characters in the buffer */
@@ -1992,7 +1991,6 @@ static void hso_std_serial_write_bulk_callback(struct urb *urb)
1992 hso_kick_transmit(serial); 1991 hso_kick_transmit(serial);
1993 1992
1994 D1(" "); 1993 D1(" ");
1995 return;
1996} 1994}
1997 1995
1998/* called for writing diag or CS serial port */ 1996/* called for writing diag or CS serial port */
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index a5fc8166c01d..297f0d202073 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -183,8 +183,6 @@ __vxge_hw_device_pci_e_init(struct __vxge_hw_device *hldev)
183 pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd); 183 pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd);
184 184
185 pci_save_state(hldev->pdev); 185 pci_save_state(hldev->pdev);
186
187 return;
188} 186}
189 187
190/* 188/*
@@ -342,8 +340,6 @@ void __vxge_hw_device_id_get(struct __vxge_hw_device *hldev)
342 340
343 hldev->minor_revision = 341 hldev->minor_revision =
344 (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64); 342 (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64);
345
346 return;
347} 343}
348 344
349/* 345/*
@@ -428,8 +424,6 @@ void __vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev)
428 hldev->first_vp_id = i; 424 hldev->first_vp_id = i;
429 break; 425 break;
430 } 426 }
431
432 return;
433} 427}
434 428
435/* 429/*
@@ -1217,8 +1211,6 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh,
1217 /* link this RxD block with previous one */ 1211 /* link this RxD block with previous one */
1218 __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index); 1212 __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index);
1219 } 1213 }
1220
1221 return;
1222} 1214}
1223 1215
1224/* 1216/*
@@ -2318,8 +2310,6 @@ __vxge_hw_fifo_mempool_item_alloc(
2318 txdl_priv->first_txdp = txdp; 2310 txdl_priv->first_txdp = txdp;
2319 txdl_priv->next_txdl_priv = NULL; 2311 txdl_priv->next_txdl_priv = NULL;
2320 txdl_priv->alloc_frags = 0; 2312 txdl_priv->alloc_frags = 0;
2321
2322 return;
2323} 2313}
2324 2314
2325/* 2315/*
@@ -2576,7 +2566,6 @@ __vxge_hw_read_rts_ds(struct vxge_hw_vpath_reg __iomem *vpath_reg,
2576 writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0); 2566 writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0);
2577 writeq(0, &vpath_reg->rts_access_steer_data1); 2567 writeq(0, &vpath_reg->rts_access_steer_data1);
2578 wmb(); 2568 wmb();
2579 return;
2580} 2569}
2581 2570
2582 2571
@@ -3484,7 +3473,6 @@ __vxge_hw_vpath_prc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
3484 val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE; 3473 val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE;
3485 3474
3486 writeq(val64, &vp_reg->prc_cfg4); 3475 writeq(val64, &vp_reg->prc_cfg4);
3487 return;
3488} 3476}
3489 3477
3490/* 3478/*
@@ -3903,7 +3891,6 @@ vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id)
3903 &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]); 3891 &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
3904 } 3892 }
3905 } 3893 }
3906 return;
3907} 3894}
3908/* 3895/*
3909 * __vxge_hw_vpath_initialize 3896 * __vxge_hw_vpath_initialize
@@ -5037,8 +5024,6 @@ __vxge_hw_blockpool_free(struct __vxge_hw_device *devh,
5037 if (status == VXGE_HW_OK) 5024 if (status == VXGE_HW_OK)
5038 __vxge_hw_blockpool_blocks_remove(blockpool); 5025 __vxge_hw_blockpool_blocks_remove(blockpool);
5039 } 5026 }
5040
5041 return;
5042} 5027}
5043 5028
5044/* 5029/*
@@ -5094,6 +5079,4 @@ __vxge_hw_blockpool_block_free(struct __vxge_hw_device *devh,
5094 } 5079 }
5095 5080
5096 __vxge_hw_blockpool_blocks_remove(blockpool); 5081 __vxge_hw_blockpool_blocks_remove(blockpool);
5097
5098 return;
5099} 5082}
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 2bab36421f71..b504bd561362 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -1764,7 +1764,6 @@ static void vxge_netpoll(struct net_device *dev)
1764 1764
1765 vxge_debug_entryexit(VXGE_TRACE, 1765 vxge_debug_entryexit(VXGE_TRACE,
1766 "%s:%d Exiting...", __func__, __LINE__); 1766 "%s:%d Exiting...", __func__, __LINE__);
1767 return;
1768} 1767}
1769#endif 1768#endif
1770 1769
@@ -2815,7 +2814,6 @@ static void vxge_napi_del_all(struct vxgedev *vdev)
2815 for (i = 0; i < vdev->no_of_vpath; i++) 2814 for (i = 0; i < vdev->no_of_vpath; i++)
2816 netif_napi_del(&vdev->vpaths[i].ring.napi); 2815 netif_napi_del(&vdev->vpaths[i].ring.napi);
2817 } 2816 }
2818 return;
2819} 2817}
2820 2818
2821int do_vxge_close(struct net_device *dev, int do_io) 2819int do_vxge_close(struct net_device *dev, int do_io)
@@ -3500,8 +3498,6 @@ static void verify_bandwidth(void)
3500 for (i = 1; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++) 3498 for (i = 1; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++)
3501 bw_percentage[i] = bw_percentage[0]; 3499 bw_percentage[i] = bw_percentage[0];
3502 } 3500 }
3503
3504 return;
3505} 3501}
3506 3502
3507/* 3503/*
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index f83e6aee3f6a..6cc1dd79b40b 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -233,8 +233,6 @@ void vxge_hw_channel_msix_mask(struct __vxge_hw_channel *channel, int msix_id)
233 __vxge_hw_pio_mem_write32_upper( 233 __vxge_hw_pio_mem_write32_upper(
234 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32), 234 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
235 &channel->common_reg->set_msix_mask_vect[msix_id%4]); 235 &channel->common_reg->set_msix_mask_vect[msix_id%4]);
236
237 return;
238} 236}
239 237
240/** 238/**
@@ -253,8 +251,6 @@ vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channel, int msix_id)
253 __vxge_hw_pio_mem_write32_upper( 251 __vxge_hw_pio_mem_write32_upper(
254 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32), 252 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
255 &channel->common_reg->clear_msix_mask_vect[msix_id%4]); 253 &channel->common_reg->clear_msix_mask_vect[msix_id%4]);
256
257 return;
258} 254}
259 255
260/** 256/**
@@ -329,8 +325,6 @@ void vxge_hw_device_intr_enable(struct __vxge_hw_device *hldev)
329 val64 = readq(&hldev->common_reg->titan_general_int_status); 325 val64 = readq(&hldev->common_reg->titan_general_int_status);
330 326
331 vxge_hw_device_unmask_all(hldev); 327 vxge_hw_device_unmask_all(hldev);
332
333 return;
334} 328}
335 329
336/** 330/**
@@ -362,8 +356,6 @@ void vxge_hw_device_intr_disable(struct __vxge_hw_device *hldev)
362 vxge_hw_vpath_intr_disable( 356 vxge_hw_vpath_intr_disable(
363 VXGE_HW_VIRTUAL_PATH_HANDLE(&hldev->virtual_paths[i])); 357 VXGE_HW_VIRTUAL_PATH_HANDLE(&hldev->virtual_paths[i]));
364 } 358 }
365
366 return;
367} 359}
368 360
369/** 361/**
@@ -383,8 +375,6 @@ void vxge_hw_device_mask_all(struct __vxge_hw_device *hldev)
383 375
384 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), 376 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
385 &hldev->common_reg->titan_mask_all_int); 377 &hldev->common_reg->titan_mask_all_int);
386
387 return;
388} 378}
389 379
390/** 380/**
@@ -404,8 +394,6 @@ void vxge_hw_device_unmask_all(struct __vxge_hw_device *hldev)
404 394
405 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32), 395 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
406 &hldev->common_reg->titan_mask_all_int); 396 &hldev->common_reg->titan_mask_all_int);
407
408 return;
409} 397}
410 398
411/** 399/**
@@ -647,8 +635,6 @@ void vxge_hw_device_clear_tx_rx(struct __vxge_hw_device *hldev)
647 hldev->tim_int_mask1[VXGE_HW_VPATH_INTR_RX]), 635 hldev->tim_int_mask1[VXGE_HW_VPATH_INTR_RX]),
648 &hldev->common_reg->tim_int_status1); 636 &hldev->common_reg->tim_int_status1);
649 } 637 }
650
651 return;
652} 638}
653 639
654/* 640/*
@@ -2255,8 +2241,6 @@ vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
2255 VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN, 2241 VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN,
2256 0, 32), &vp_reg->one_shot_vect3_en); 2242 0, 32), &vp_reg->one_shot_vect3_en);
2257 } 2243 }
2258
2259 return;
2260} 2244}
2261 2245
2262/** 2246/**
@@ -2278,8 +2262,6 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vp, int msix_id)
2278 __vxge_hw_pio_mem_write32_upper( 2262 __vxge_hw_pio_mem_write32_upper(
2279 (u32) vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32), 2263 (u32) vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
2280 &hldev->common_reg->set_msix_mask_vect[msix_id % 4]); 2264 &hldev->common_reg->set_msix_mask_vect[msix_id % 4]);
2281
2282 return;
2283} 2265}
2284 2266
2285/** 2267/**
@@ -2310,8 +2292,6 @@ vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
2310 &hldev->common_reg-> 2292 &hldev->common_reg->
2311 clear_msix_mask_vect[msix_id%4]); 2293 clear_msix_mask_vect[msix_id%4]);
2312 } 2294 }
2313
2314 return;
2315} 2295}
2316 2296
2317/** 2297/**
@@ -2333,8 +2313,6 @@ vxge_hw_vpath_msix_unmask(struct __vxge_hw_vpath_handle *vp, int msix_id)
2333 __vxge_hw_pio_mem_write32_upper( 2313 __vxge_hw_pio_mem_write32_upper(
2334 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32), 2314 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
2335 &hldev->common_reg->clear_msix_mask_vect[msix_id%4]); 2315 &hldev->common_reg->clear_msix_mask_vect[msix_id%4]);
2336
2337 return;
2338} 2316}
2339 2317
2340/** 2318/**
@@ -2351,8 +2329,6 @@ vxge_hw_vpath_msix_mask_all(struct __vxge_hw_vpath_handle *vp)
2351 __vxge_hw_pio_mem_write32_upper( 2329 __vxge_hw_pio_mem_write32_upper(
2352 (u32)vxge_bVALn(vxge_mBIT(vp->vpath->vp_id), 0, 32), 2330 (u32)vxge_bVALn(vxge_mBIT(vp->vpath->vp_id), 0, 32),
2353 &vp->vpath->hldev->common_reg->set_msix_mask_all_vect); 2331 &vp->vpath->hldev->common_reg->set_msix_mask_all_vect);
2354
2355 return;
2356} 2332}
2357 2333
2358/** 2334/**
@@ -2391,8 +2367,6 @@ void vxge_hw_vpath_inta_mask_tx_rx(struct __vxge_hw_vpath_handle *vp)
2391 tim_int_mask1[VXGE_HW_VPATH_INTR_RX] | val64), 2367 tim_int_mask1[VXGE_HW_VPATH_INTR_RX] | val64),
2392 &hldev->common_reg->tim_int_mask1); 2368 &hldev->common_reg->tim_int_mask1);
2393 } 2369 }
2394
2395 return;
2396} 2370}
2397 2371
2398/** 2372/**
@@ -2429,8 +2403,6 @@ void vxge_hw_vpath_inta_unmask_tx_rx(struct __vxge_hw_vpath_handle *vp)
2429 tim_int_mask1[VXGE_HW_VPATH_INTR_RX])) & val64, 2403 tim_int_mask1[VXGE_HW_VPATH_INTR_RX])) & val64,
2430 &hldev->common_reg->tim_int_mask1); 2404 &hldev->common_reg->tim_int_mask1);
2431 } 2405 }
2432
2433 return;
2434} 2406}
2435 2407
2436/** 2408/**
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index d8322d2d1e29..746a5ee32f33 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -395,7 +395,6 @@ wd_reset_8390(struct net_device *dev)
395 outb(NIC16 | ((dev->mem_start>>19) & 0x1f), wd_cmd_port+WD_CMDREG5); 395 outb(NIC16 | ((dev->mem_start>>19) & 0x1f), wd_cmd_port+WD_CMDREG5);
396 396
397 if (ei_debug > 1) printk("reset done\n"); 397 if (ei_debug > 1) printk("reset done\n");
398 return;
399} 398}
400 399
401/* Grab the 8390 specific header. Similar to the block_input routine, but 400/* Grab the 8390 specific header. Similar to the block_input routine, but
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index 6180772dcc09..f8a9734243d0 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -568,7 +568,6 @@ void i2400m_msg_ack_hook(struct i2400m *i2400m,
568 } 568 }
569 break; 569 break;
570 }; 570 };
571 return;
572} 571}
573 572
574 573
@@ -1419,5 +1418,4 @@ void i2400m_dev_shutdown(struct i2400m *i2400m)
1419 1418
1420 d_fnstart(3, dev, "(i2400m %p)\n", i2400m); 1419 d_fnstart(3, dev, "(i2400m %p)\n", i2400m);
1421 d_fnend(3, dev, "(i2400m %p) = void\n", i2400m); 1420 d_fnend(3, dev, "(i2400m %p) = void\n", i2400m);
1422 return;
1423} 1421}
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 94dc83c3969d..0043cc1152bd 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -711,7 +711,6 @@ out:
711 kfree(iw); 711 kfree(iw);
712 d_fnend(3, dev, "(ws %p i2400m %p reason %s) = void\n", 712 d_fnend(3, dev, "(ws %p i2400m %p reason %s) = void\n",
713 ws, i2400m, reason); 713 ws, i2400m, reason);
714 return;
715} 714}
716 715
717 716
@@ -996,7 +995,6 @@ void __exit i2400m_driver_exit(void)
996 /* for scheds i2400m_dev_reset_handle() */ 995 /* for scheds i2400m_dev_reset_handle() */
997 flush_scheduled_work(); 996 flush_scheduled_work();
998 i2400m_barker_db_exit(); 997 i2400m_barker_db_exit();
999 return;
1000} 998}
1001module_exit(i2400m_driver_exit); 999module_exit(i2400m_driver_exit);
1002 1000
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index b811c2f1f5e9..149b9f57e5cc 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -255,7 +255,6 @@ void i2400m_net_wake_stop(struct i2400m *i2400m)
255 kfree_skb(wake_tx_skb); 255 kfree_skb(wake_tx_skb);
256 } 256 }
257 d_fnend(3, dev, "(i2400m %p) = void\n", i2400m); 257 d_fnend(3, dev, "(i2400m %p) = void\n", i2400m);
258 return;
259} 258}
260 259
261 260
@@ -434,7 +433,6 @@ void i2400m_tx_timeout(struct net_device *net_dev)
434 * this, there might be data pending to be sent or not... 433 * this, there might be data pending to be sent or not...
435 */ 434 */
436 net_dev->stats.tx_errors++; 435 net_dev->stats.tx_errors++;
437 return;
438} 436}
439 437
440 438
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index fa2e11e5b4b9..5fa841d913b2 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -313,7 +313,6 @@ error_waiter_cancelled:
313 kfree_skb(ack_skb); 313 kfree_skb(ack_skb);
314error_no_waiter: 314error_no_waiter:
315 spin_unlock_irqrestore(&i2400m->rx_lock, flags); 315 spin_unlock_irqrestore(&i2400m->rx_lock, flags);
316 return;
317} 316}
318 317
319 318
@@ -718,7 +717,6 @@ void __i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq,
718out: 717out:
719 d_fnend(4, dev, "(i2400m %p roq %p skb %p sn %u nsn %d) = void\n", 718 d_fnend(4, dev, "(i2400m %p roq %p skb %p sn %u nsn %d) = void\n",
720 i2400m, roq, skb, sn, nsn); 719 i2400m, roq, skb, sn, nsn);
721 return;
722} 720}
723 721
724 722
@@ -798,7 +796,6 @@ void i2400m_roq_reset(struct i2400m *i2400m, struct i2400m_roq *roq)
798 } 796 }
799 roq->ws = 0; 797 roq->ws = 0;
800 d_fnend(2, dev, "(i2400m %p roq %p) = void\n", i2400m, roq); 798 d_fnend(2, dev, "(i2400m %p roq %p) = void\n", i2400m, roq);
801 return;
802} 799}
803 800
804 801
@@ -837,7 +834,6 @@ void i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq,
837 } 834 }
838 d_fnend(2, dev, "(i2400m %p roq %p skb %p lbn %u) = void\n", 835 d_fnend(2, dev, "(i2400m %p roq %p skb %p lbn %u) = void\n",
839 i2400m, roq, skb, lbn); 836 i2400m, roq, skb, lbn);
840 return;
841} 837}
842 838
843 839
@@ -863,7 +859,6 @@ void i2400m_roq_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
863 i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_WS, 859 i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_WS,
864 old_ws, len, sn, nsn, roq->ws); 860 old_ws, len, sn, nsn, roq->ws);
865 d_fnstart(2, dev, "(i2400m %p roq %p sn %u) = void\n", i2400m, roq, sn); 861 d_fnstart(2, dev, "(i2400m %p roq %p sn %u) = void\n", i2400m, roq, sn);
866 return;
867} 862}
868 863
869 864
@@ -912,7 +907,6 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
912 } 907 }
913 d_fnend(2, dev, "(i2400m %p roq %p skb %p sn %u) = void\n", 908 d_fnend(2, dev, "(i2400m %p roq %p skb %p sn %u) = void\n",
914 i2400m, roq, skb, sn); 909 i2400m, roq, skb, sn);
915 return;
916} 910}
917 911
918 912
@@ -1041,7 +1035,6 @@ error_skb_clone:
1041error: 1035error:
1042 d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p " 1036 d_fnend(2, dev, "(i2400m %p skb_rx %p single %u payload %p "
1043 "size %zu) = void\n", i2400m, skb_rx, single_last, payload, size); 1037 "size %zu) = void\n", i2400m, skb_rx, single_last, payload, size);
1044 return;
1045} 1038}
1046 1039
1047 1040
diff --git a/drivers/net/wimax/i2400m/sdio-rx.c b/drivers/net/wimax/i2400m/sdio-rx.c
index d619da33f20b..8b809c2ead6c 100644
--- a/drivers/net/wimax/i2400m/sdio-rx.c
+++ b/drivers/net/wimax/i2400m/sdio-rx.c
@@ -197,7 +197,6 @@ error_alloc_skb:
197error_get_size: 197error_get_size:
198error_bad_size: 198error_bad_size:
199 d_fnend(7, dev, "(i2400ms %p) = %d\n", i2400ms, ret); 199 d_fnend(7, dev, "(i2400ms %p) = %d\n", i2400ms, ret);
200 return;
201} 200}
202 201
203 202
@@ -229,7 +228,6 @@ void i2400ms_irq(struct sdio_func *func)
229 i2400ms_rx(i2400ms); 228 i2400ms_rx(i2400ms);
230error_no_irq: 229error_no_irq:
231 d_fnend(6, dev, "(i2400ms %p) = void\n", i2400ms); 230 d_fnend(6, dev, "(i2400ms %p) = void\n", i2400ms);
232 return;
233} 231}
234 232
235 233
diff --git a/drivers/net/wimax/i2400m/usb-notif.c b/drivers/net/wimax/i2400m/usb-notif.c
index 7b6a1d98bd74..d44b545f4082 100644
--- a/drivers/net/wimax/i2400m/usb-notif.c
+++ b/drivers/net/wimax/i2400m/usb-notif.c
@@ -178,7 +178,6 @@ error_submit:
178out: 178out:
179 d_fnend(4, dev, "(urb %p status %d actual_length %d) = void\n", 179 d_fnend(4, dev, "(urb %p status %d actual_length %d) = void\n",
180 urb, urb->status, urb->actual_length); 180 urb, urb->status, urb->actual_length);
181 return;
182} 181}
183 182
184 183
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 7a626d4e100f..8a2d4afc74f8 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1223,7 +1223,6 @@ static void at76_rx_callback(struct urb *urb)
1223 1223
1224 priv->rx_tasklet.data = (unsigned long)urb; 1224 priv->rx_tasklet.data = (unsigned long)urb;
1225 tasklet_schedule(&priv->rx_tasklet); 1225 tasklet_schedule(&priv->rx_tasklet);
1226 return;
1227} 1226}
1228 1227
1229static int at76_submit_rx_urb(struct at76_priv *priv) 1228static int at76_submit_rx_urb(struct at76_priv *priv)
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 3ce9afba1d88..1b81c4778800 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -2145,8 +2145,6 @@ ath5k_get_chan_pcal_surrounding_piers(struct ath5k_hw *ah,
2145done: 2145done:
2146 *pcinfo_l = &pcinfo[idx_l]; 2146 *pcinfo_l = &pcinfo[idx_l];
2147 *pcinfo_r = &pcinfo[idx_r]; 2147 *pcinfo_r = &pcinfo[idx_r];
2148
2149 return;
2150} 2148}
2151 2149
2152/* 2150/*
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 44bbbf2a6edd..307f80e83f94 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -627,7 +627,6 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
627 627
628 AR5K_REG_WRITE_BITS(ah, AR5K_TSF_PARM, AR5K_TSF_PARM_INC, 1); 628 AR5K_REG_WRITE_BITS(ah, AR5K_TSF_PARM, AR5K_TSF_PARM_INC, 1);
629 } 629 }
630 return;
631} 630}
632 631
633/* TODO: Half/Quarter rate */ 632/* TODO: Half/Quarter rate */
@@ -883,8 +882,6 @@ static void ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
883 /* Heavy clipping -disable for now */ 882 /* Heavy clipping -disable for now */
884 if (ah->ah_ee_version >= AR5K_EEPROM_VERSION_5_1) 883 if (ah->ah_ee_version >= AR5K_EEPROM_VERSION_5_1)
885 ath5k_hw_reg_write(ah, 0, AR5K_PHY_HEAVY_CLIP_ENABLE); 884 ath5k_hw_reg_write(ah, 0, AR5K_PHY_HEAVY_CLIP_ENABLE);
886
887 return;
888} 885}
889 886
890/* 887/*
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 5fcafb460877..56a9e5fa6d66 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -726,7 +726,6 @@ static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
726 726
727TX_IQ_CAL_FAILED: 727TX_IQ_CAL_FAILED:
728 ath_print(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n"); 728 ath_print(common, ATH_DBG_CALIBRATE, "Tx IQ Cal failed\n");
729 return;
730} 729}
731 730
732static bool ar9003_hw_init_cal(struct ath_hw *ah, 731static bool ar9003_hw_init_cal(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 6982577043b8..07b8fa6fb62f 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -86,7 +86,6 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath9k_nfcal_hist *h,
86 ath9k_hw_get_nf_hist_mid(h[i].nfCalBuffer); 86 ath9k_hw_get_nf_hist_mid(h[i].nfCalBuffer);
87 } 87 }
88 } 88 }
89 return;
90} 89}
91 90
92static bool ath9k_hw_get_nf_thresh(struct ath_hw *ah, 91static bool ath9k_hw_get_nf_thresh(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index bd9dff3293dc..ca8704a9d7ac 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -36,8 +36,6 @@ void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, u32 reg, u32 mask,
36 36
37 if (ah->config.analog_shiftreg) 37 if (ah->config.analog_shiftreg)
38 udelay(100); 38 udelay(100);
39
40 return;
41} 39}
42 40
43int16_t ath9k_hw_interpolate(u16 target, u16 srcLeft, u16 srcRight, 41int16_t ath9k_hw_interpolate(u16 target, u16 srcLeft, u16 srcRight,
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index e591ad6016e5..7e1ed78d0e64 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -50,7 +50,6 @@ static void ath9k_get_txgain_index(struct ath_hw *ah,
50 i++; 50 i++;
51 51
52 *pcdacIdx = i; 52 *pcdacIdx = i;
53 return;
54} 53}
55 54
56static void ath9k_olc_get_pdadcs(struct ath_hw *ah, 55static void ath9k_olc_get_pdadcs(struct ath_hw *ah,
@@ -751,8 +750,6 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
751 pPDADCValues[k] = pPDADCValues[k - 1]; 750 pPDADCValues[k] = pPDADCValues[k - 1];
752 k++; 751 k++;
753 } 752 }
754
755 return;
756} 753}
757 754
758static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah, 755static int16_t ath9k_change_gain_boundary_setting(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 28abc7d5e909..2571b443ac82 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -663,7 +663,6 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
663 return; 663 return;
664err: 664err:
665 dev_kfree_skb_any(skb); 665 dev_kfree_skb_any(skb);
666 return;
667} 666}
668 667
669/* FIXME: Locking for cleanup/init */ 668/* FIXME: Locking for cleanup/init */
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index 24d59883d944..3f4244f56ce5 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -333,7 +333,6 @@ static void ath_reg_apply_world_flags(struct wiphy *wiphy,
333 ath_reg_apply_active_scan_flags(wiphy, initiator); 333 ath_reg_apply_active_scan_flags(wiphy, initiator);
334 break; 334 break;
335 } 335 }
336 return;
337} 336}
338 337
339int ath_reg_notifier_apply(struct wiphy *wiphy, 338int ath_reg_notifier_apply(struct wiphy *wiphy,
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 2088ac029b35..a59ceb26cd83 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -3239,7 +3239,6 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
3239 IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX, 3239 IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
3240 txq->next); 3240 txq->next);
3241 } 3241 }
3242 return;
3243} 3242}
3244 3243
3245static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) 3244static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 82de71a3aea7..3aa3bb18f615 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -2607,8 +2607,6 @@ static inline void eeprom_write_reg(struct ipw_priv *p, u32 data)
2607 2607
2608 /* the eeprom requires some time to complete the operation */ 2608 /* the eeprom requires some time to complete the operation */
2609 udelay(p->eeprom_delay); 2609 udelay(p->eeprom_delay);
2610
2611 return;
2612} 2610}
2613 2611
2614/* perform a chip select operation */ 2612/* perform a chip select operation */
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 39a34da52d52..0de1b1893220 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -918,7 +918,6 @@ void libipw_rx_any(struct libipw_device *ieee,
918drop_free: 918drop_free:
919 dev_kfree_skb_irq(skb); 919 dev_kfree_skb_irq(skb);
920 ieee->dev->stats.rx_dropped++; 920 ieee->dev->stats.rx_dropped++;
921 return;
922} 921}
923 922
924#define MGMT_FRAME_FIXED_PART_LENGTH 0x24 923#define MGMT_FRAME_FIXED_PART_LENGTH 0x24
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 32eb4709acac..8e84a08ff951 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -545,8 +545,6 @@ static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband
545 spin_unlock_irqrestore(&rs_sta->lock, flags); 545 spin_unlock_irqrestore(&rs_sta->lock, flags);
546 546
547 IWL_DEBUG_RATE(priv, "leave\n"); 547 IWL_DEBUG_RATE(priv, "leave\n");
548
549 return;
550} 548}
551 549
552static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta, 550static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index bfcac5608d87..cf4a95bae4ff 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -2337,8 +2337,6 @@ out:
2337 tbl->current_rate = rate_n_flags_from_tbl(priv, tbl, index, is_green); 2337 tbl->current_rate = rate_n_flags_from_tbl(priv, tbl, index, is_green);
2338 i = index; 2338 i = index;
2339 lq_sta->last_txrate_idx = i; 2339 lq_sta->last_txrate_idx = i;
2340
2341 return;
2342} 2340}
2343 2341
2344/** 2342/**
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index a672d3379cfd..cc15e929a987 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2494,7 +2494,6 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
2494 } 2494 }
2495 2495
2496 mutex_unlock(&priv->mutex); 2496 mutex_unlock(&priv->mutex);
2497 return;
2498} 2497}
2499 2498
2500static void iwl_bg_restart(struct work_struct *data) 2499static void iwl_bg_restart(struct work_struct *data)
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index f1fd00b1a65d..7e8227773213 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -638,8 +638,6 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
638 iwl_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time); 638 iwl_sens_auto_corr_ofdm(priv, norm_fa_ofdm, rx_enable_time);
639 iwl_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis); 639 iwl_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
640 iwl_sensitivity_write(priv); 640 iwl_sensitivity_write(priv);
641
642 return;
643} 641}
644EXPORT_SYMBOL(iwl_sensitivity_calibration); 642EXPORT_SYMBOL(iwl_sensitivity_calibration);
645 643
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 4cdf4d3a9ddb..87eb89f000f5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -769,7 +769,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf)
769 "extension channel offset 0x%x\n", 769 "extension channel offset 0x%x\n",
770 le32_to_cpu(rxon->flags), ht_conf->ht_protection, 770 le32_to_cpu(rxon->flags), ht_conf->ht_protection,
771 ht_conf->extension_chan_offset); 771 ht_conf->extension_chan_offset);
772 return;
773} 772}
774EXPORT_SYMBOL(iwl_set_rxon_ht); 773EXPORT_SYMBOL(iwl_set_rxon_ht);
775 774
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c7e1d7d09e02..1beb81c0be68 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -848,7 +848,6 @@ static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,
848#endif 848#endif
849 849
850 IWL_DEBUG_RX(priv, "Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status); 850 IWL_DEBUG_RX(priv, "Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status);
851 return;
852} 851}
853 852
854static void iwl3945_bg_beacon_update(struct work_struct *work) 853static void iwl3945_bg_beacon_update(struct work_struct *work)
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 1acea37f39f8..edcb52330cf5 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -479,8 +479,6 @@ static void iwm_sdio_remove(struct sdio_func *func)
479 sdio_set_drvdata(func, NULL); 479 sdio_set_drvdata(func, NULL);
480 480
481 dev_info(dev, "IWM SDIO remove\n"); 481 dev_info(dev, "IWM SDIO remove\n");
482
483 return;
484} 482}
485 483
486static const struct sdio_device_id iwm_sdio_ids[] = { 484static const struct sdio_device_id iwm_sdio_ids[] = {
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 6f5b843c1f44..de2caac11dd6 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -757,15 +757,12 @@ void lbs_debugfs_init(void)
757{ 757{
758 if (!lbs_dir) 758 if (!lbs_dir)
759 lbs_dir = debugfs_create_dir("lbs_wireless", NULL); 759 lbs_dir = debugfs_create_dir("lbs_wireless", NULL);
760
761 return;
762} 760}
763 761
764void lbs_debugfs_remove(void) 762void lbs_debugfs_remove(void)
765{ 763{
766 if (lbs_dir) 764 if (lbs_dir)
767 debugfs_remove(lbs_dir); 765 debugfs_remove(lbs_dir);
768 return;
769} 766}
770 767
771void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev) 768void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev)
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index fcea5741ba62..f41594c7ac16 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -133,8 +133,6 @@ static void if_usb_write_bulk_callback(struct urb *urb)
133 /* print the failure status number for debug */ 133 /* print the failure status number for debug */
134 lbs_pr_info("URB in failure status: %d\n", urb->status); 134 lbs_pr_info("URB in failure status: %d\n", urb->status);
135 } 135 }
136
137 return;
138} 136}
139 137
140/** 138/**
@@ -651,8 +649,6 @@ static void if_usb_receive_fwload(struct urb *urb)
651 if_usb_submit_rx_urb_fwload(cardp); 649 if_usb_submit_rx_urb_fwload(cardp);
652 650
653 kfree(syncfwheader); 651 kfree(syncfwheader);
654
655 return;
656} 652}
657 653
658#define MRVDRV_MIN_PKT_LEN 30 654#define MRVDRV_MIN_PKT_LEN 30
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index e2b8d886b091..a115bfa9513a 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -90,7 +90,6 @@ static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd)
90 priv->nextSNRNF++; 90 priv->nextSNRNF++;
91 if (priv->nextSNRNF >= DEFAULT_DATA_AVG_FACTOR) 91 if (priv->nextSNRNF >= DEFAULT_DATA_AVG_FACTOR)
92 priv->nextSNRNF = 0; 92 priv->nextSNRNF = 0;
93 return;
94} 93}
95 94
96/** 95/**
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 4412c279ca94..c445500ffc61 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -576,7 +576,6 @@ static void if_usb_receive_fwload(struct urb *urb)
576 kfree(syncfwheader); 576 kfree(syncfwheader);
577 577
578 lbtf_deb_leave(LBTF_DEB_USB); 578 lbtf_deb_leave(LBTF_DEB_USB);
579 return;
580} 579}
581 580
582#define MRVDRV_MIN_PKT_LEN 30 581#define MRVDRV_MIN_PKT_LEN 30
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 60787de56f3a..6a04c2157f73 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -360,7 +360,6 @@ static void lbtf_op_stop(struct ieee80211_hw *hw)
360 lbtf_set_radio_control(priv); 360 lbtf_set_radio_control(priv);
361 361
362 lbtf_deb_leave(LBTF_DEB_MACOPS); 362 lbtf_deb_leave(LBTF_DEB_MACOPS);
363 return;
364} 363}
365 364
366static int lbtf_op_add_interface(struct ieee80211_hw *hw, 365static int lbtf_op_add_interface(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 97e954ee17f8..ca71f08709bc 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1618,8 +1618,6 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
1618 /* We don't actually do anything about it */ 1618 /* We don't actually do anything about it */
1619 break; 1619 break;
1620 } 1620 }
1621
1622 return;
1623} 1621}
1624EXPORT_SYMBOL(__orinoco_ev_info); 1622EXPORT_SYMBOL(__orinoco_ev_info);
1625 1623
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 743a6c68b29d..d5b197b4d5bb 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -875,7 +875,6 @@ static void p54u_stop(struct ieee80211_hw *dev)
875 the hardware is still usable next time we want to start it. 875 the hardware is still usable next time we want to start it.
876 until then, we just stop listening to the hardware.. */ 876 until then, we just stop listening to the hardware.. */
877 p54u_free_urbs(dev); 877 p54u_free_urbs(dev);
878 return;
879} 878}
880 879
881static int __devinit p54u_probe(struct usb_interface *intf, 880static int __devinit p54u_probe(struct usb_interface *intf,
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index a45818ebfdfb..8d1190c0f062 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -210,8 +210,6 @@ prism54_update_stats(struct work_struct *work)
210 priv->local_iwstatistics.discard.retries = r.u; 210 priv->local_iwstatistics.discard.retries = r.u;
211 211
212 mutex_unlock(&priv->stats_lock); 212 mutex_unlock(&priv->stats_lock);
213
214 return;
215} 213}
216 214
217struct iw_statistics * 215struct iw_statistics *
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 73972ee76540..3886b21becd9 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -735,8 +735,6 @@ static void verify_dl_startup(u_long data)
735 start_net((u_long) local); 735 start_net((u_long) local);
736 else 736 else
737 join_net((u_long) local); 737 join_net((u_long) local);
738
739 return;
740} /* end verify_dl_startup */ 738} /* end verify_dl_startup */
741 739
742/*===========================================================================*/ 740/*===========================================================================*/
@@ -764,7 +762,6 @@ static void start_net(u_long data)
764 return; 762 return;
765 } 763 }
766 local->card_status = CARD_DOING_ACQ; 764 local->card_status = CARD_DOING_ACQ;
767 return;
768} /* end start_net */ 765} /* end start_net */
769 766
770/*===========================================================================*/ 767/*===========================================================================*/
@@ -795,7 +792,6 @@ static void join_net(u_long data)
795 return; 792 return;
796 } 793 }
797 local->card_status = CARD_DOING_ACQ; 794 local->card_status = CARD_DOING_ACQ;
798 return;
799} 795}
800 796
801/*============================================================================ 797/*============================================================================
@@ -1626,7 +1622,6 @@ static int ray_dev_close(struct net_device *dev)
1626static void ray_reset(struct net_device *dev) 1622static void ray_reset(struct net_device *dev)
1627{ 1623{
1628 pr_debug("ray_reset entered\n"); 1624 pr_debug("ray_reset entered\n");
1629 return;
1630} 1625}
1631 1626
1632/*===========================================================================*/ 1627/*===========================================================================*/
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index 9569fb4e5bc5..e2497f820d75 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -700,8 +700,6 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
700exit: 700exit:
701 rt2x00debug_deregister(rt2x00dev); 701 rt2x00debug_deregister(rt2x00dev);
702 ERROR(rt2x00dev, "Failed to register debug handler.\n"); 702 ERROR(rt2x00dev, "Failed to register debug handler.\n");
703
704 return;
705} 703}
706 704
707void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev) 705void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c
index af5c67b4da95..851515836a7f 100644
--- a/drivers/net/wireless/wl12xx/wl1251_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -183,6 +183,4 @@ void wl1251_rx(struct wl1251 *wl)
183 183
184 /* Finally, we need to ACK the RX */ 184 /* Finally, we need to ACK the RX */
185 wl1251_rx_ack(wl); 185 wl1251_rx_ack(wl);
186
187 return;
188} 186}
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 1e61e6cace90..6449fe3d128f 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1452,8 +1452,6 @@ static void wl3501_detach(struct pcmcia_device *link)
1452 1452
1453 if (link->priv) 1453 if (link->priv)
1454 free_netdev(link->priv); 1454 free_netdev(link->priv);
1455
1456 return;
1457} 1455}
1458 1456
1459static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info, 1457static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info,
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index ece86a5d3355..390d77f762c4 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -134,7 +134,6 @@ static void zd1201_usbfree(struct urb *urb)
134 134
135 kfree(urb->transfer_buffer); 135 kfree(urb->transfer_buffer);
136 usb_free_urb(urb); 136 usb_free_urb(urb);
137 return;
138} 137}
139 138
140/* cmdreq message: 139/* cmdreq message:
@@ -185,7 +184,6 @@ static void zd1201_usbtx(struct urb *urb)
185{ 184{
186 struct zd1201 *zd = urb->context; 185 struct zd1201 *zd = urb->context;
187 netif_wake_queue(zd->dev); 186 netif_wake_queue(zd->dev);
188 return;
189} 187}
190 188
191/* Incoming data */ 189/* Incoming data */
@@ -407,7 +405,6 @@ exit:
407 wake_up(&zd->rxdataq); 405 wake_up(&zd->rxdataq);
408 kfree(urb->transfer_buffer); 406 kfree(urb->transfer_buffer);
409 } 407 }
410 return;
411} 408}
412 409
413static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata, 410static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index efbff76a9908..4eb67aed68dd 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -564,7 +564,6 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int value
564 for (i = 10000; i >= 0; i--) 564 for (i = 10000; i >= 0; i--)
565 if ((ioread16(ioaddr + MII_Status) & 1) == 0) 565 if ((ioread16(ioaddr + MII_Status) & 1) == 0)
566 break; 566 break;
567 return;
568} 567}
569 568
570 569
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index b9fd2f0cdd3d..c3a329204511 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -801,7 +801,6 @@ static void znet_rx(struct net_device *dev)
801 /* If any worth-while packets have been received, dev_rint() 801 /* If any worth-while packets have been received, dev_rint()
802 has done a mark_bh(INET_BH) for us and will work on them 802 has done a mark_bh(INET_BH) for us and will work on them
803 when we get to the bottom-half routine. */ 803 when we get to the bottom-half routine. */
804 return;
805} 804}
806 805
807/* The inverse routine to znet_open(). */ 806/* The inverse routine to znet_open(). */
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index 81c753a617ab..4f7b9d6a087b 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -430,7 +430,6 @@ static void zorro8390_block_output(struct net_device *dev, int count,
430 430
431 z_writeb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */ 431 z_writeb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */
432 ei_status.dmaing &= ~0x01; 432 ei_status.dmaing &= ~0x01;
433 return;
434} 433}
435 434
436static void __devexit zorro8390_remove_one(struct zorro_dev *z) 435static void __devexit zorro8390_remove_one(struct zorro_dev *z)