forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/net: Remove unnecessary returns from void function()s

Browse source 
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>
This commit is contained in:
Joe Perches 2010-05-14 00:19:28 -07:00 • committed by David S. Miller
commit a4b770972b
171 changed files with 0 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/3c501.c
View file

@ -726,7 +726,6 @@ static void el_receive(struct net_device *dev)
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len; dev->stats.rx_bytes += pkt_len;
} }
return;
} }
/** /**

2
drivers/net/3c503.c
View file

@ -573,7 +573,6 @@ el2_block_output(struct net_device *dev, int count,
} }
blocked:; blocked:;
outb_p(ei_status.interface_num==0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL); outb_p(ei_status.interface_num==0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL);
return;
} }
/* Read the 4 byte, page aligned 8390 specific header. */ /* 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
} }
blocked:; blocked:;
outb_p(ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL); outb_p(ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI, E33G_CNTRL);
return;
} }

1
drivers/net/3c507.c
View file

@ -764,7 +764,6 @@ static void init_82586_mem(struct net_device *dev)
if (net_debug > 4) if (net_debug > 4)
pr_debug("%s: Initialized 82586, status %04x.\n", dev->name, pr_debug("%s: Initialized 82586, status %04x.\n", dev->name,
readw(shmem+iSCB_STATUS)); readw(shmem+iSCB_STATUS));
return;
} }
static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad) static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad)

1
drivers/net/3c509.c
View file

@ -1037,7 +1037,6 @@ static void update_stats(struct net_device *dev)
/* Back to window 1, and turn statistics back on. */ /* Back to window 1, and turn statistics back on. */
EL3WINDOW(1); EL3WINDOW(1);
outw(StatsEnable, ioaddr + EL3_CMD); outw(StatsEnable, ioaddr + EL3_CMD);
return;
} }
static int static int

2
drivers/net/3c515.c
View file

@ -958,7 +958,6 @@ static void corkscrew_timer(unsigned long data)
dev->name, media_tbl[dev->if_port].name); dev->name, media_tbl[dev->if_port].name);
#endif /* AUTOMEDIA */ #endif /* AUTOMEDIA */
return;
} }
static void corkscrew_timeout(struct net_device *dev) static void corkscrew_timeout(struct net_device *dev)
@ -1516,7 +1515,6 @@ static void update_stats(int ioaddr, struct net_device *dev)
/* We change back to window 7 (not 1) with the Vortex. */ /* We change back to window 7 (not 1) with the Vortex. */
EL3WINDOW(7); EL3WINDOW(7);
return;
} }
/* This new version of set_rx_mode() supports v1.4 kernels. /* This new version of set_rx_mode() supports v1.4 kernels.

3
drivers/net/3c59x.c
View file

@ -1855,7 +1855,6 @@ leave_media_alone:
mod_timer(&vp->timer, RUN_AT(next_tick)); mod_timer(&vp->timer, RUN_AT(next_tick));
if (vp->deferred) if (vp->deferred)
iowrite16(FakeIntr, ioaddr + EL3_CMD); iowrite16(FakeIntr, ioaddr + EL3_CMD);
return;
} }
static void vortex_tx_timeout(struct net_device *dev) static void vortex_tx_timeout(struct net_device *dev)
@ -2798,7 +2797,6 @@ static void update_stats(void __iomem *ioaddr, struct net_device *dev)
} }
EL3WINDOW(old_window >> 13); EL3WINDOW(old_window >> 13);
return;
} }
static int vortex_nway_reset(struct net_device *dev) static 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
iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); iowrite16(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
mdio_delay(); mdio_delay();
} }
return;
} }
/* ACPI: Advanced Configuration and Power Interface. */ /* ACPI: Advanced Configuration and Power Interface. */

1
drivers/net/7990.c
View file

@ -619,7 +619,6 @@ static void lance_load_multicast (struct net_device *dev)
crc = crc >> 26; crc = crc >> 26;
mcast_table [crc >> 4] |= 1 << (crc & 0xf); mcast_table [crc >> 4] |= 1 << (crc & 0xf);
} }
return;
} }

2
drivers/net/8139cp.c
View file

@ -1224,8 +1224,6 @@ static void cp_tx_timeout(struct net_device *dev)
netif_wake_queue(dev); netif_wake_queue(dev);
spin_unlock_irqrestore(&cp->lock, flags); spin_unlock_irqrestore(&cp->lock, flags);
return;
} }
#ifdef BROKEN #ifdef BROKEN

1
drivers/net/a2065.c
View file

@ -627,7 +627,6 @@ static void lance_load_multicast (struct net_device *dev)
crc = crc >> 26; crc = crc >> 26;
mcast_table [crc >> 4] |= 1 << (crc & 0xf); mcast_table [crc >> 4] |= 1 << (crc & 0xf);
} }
return;
} }
static void lance_set_multicast (struct net_device *dev) static void lance_set_multicast (struct net_device *dev)

2
drivers/net/ac3200.c
View file

@ -307,8 +307,6 @@ static void ac_reset_8390(struct net_device *dev)
ei_status.txing = 0; ei_status.txing = 0;
outb(AC_ENABLE, ioaddr + AC_RESET_PORT); outb(AC_ENABLE, ioaddr + AC_RESET_PORT);
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* Grab the 8390 specific header. Similar to the block_input routine, but /* Grab the 8390 specific header. Similar to the block_input routine, but

2
drivers/net/acenic.c
View file

@ -2919,8 +2919,6 @@ static void __devinit ace_clear(struct ace_regs __iomem *regs, u32 dest, int siz
dest += tsize; dest += tsize;
size -= tsize; size -= tsize;
} }
return;
} }

1
drivers/net/apne.c
View file

@ -521,7 +521,6 @@ apne_block_output(struct net_device *dev, int count,
outb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */ outb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }
static irqreturn_t apne_interrupt(int irq, void *dev_id) static irqreturn_t apne_interrupt(int irq, void *dev_id)

4
drivers/net/appletalk/cops.c
View file

@ -593,8 +593,6 @@ static void cops_load (struct net_device *dev)
tangent_wait_reset(ioaddr); tangent_wait_reset(ioaddr);
inb(ioaddr); /* Clear initial ready signal. */ inb(ioaddr); /* Clear initial ready signal. */
} }
return;
} }
/* /*
@ -701,8 +699,6 @@ static void cops_poll(unsigned long ltdev)
/* poll 20 times per second */ /* poll 20 times per second */
cops_timer.expires = jiffies + HZ/20; cops_timer.expires = jiffies + HZ/20;
add_timer(&cops_timer); add_timer(&cops_timer);
return;
} }
/* /*

1
drivers/net/appletalk/ltpc.c
View file

@ -641,7 +641,6 @@ done:
inb_p(base+7); inb_p(base+7);
inb_p(base+7); inb_p(base+7);
} }
return;
} }

2
drivers/net/at1700.c
View file

@ -795,7 +795,6 @@ net_rx(struct net_device *dev)
printk("%s: Exint Rx packet with mode %02x after %d ticks.\n", printk("%s: Exint Rx packet with mode %02x after %d ticks.\n",
dev->name, inb(ioaddr + RX_MODE), i); dev->name, inb(ioaddr + RX_MODE), i);
} }
return;
} }
/* The inverse routine to net_open(). */ /* The inverse routine to net_open(). */
@ -869,7 +868,6 @@ set_rx_mode(struct net_device *dev)
outw(saved_bank, ioaddr + CONFIG_0); outw(saved_bank, ioaddr + CONFIG_0);
} }
spin_unlock_irqrestore (&lp->lock, flags); spin_unlock_irqrestore (&lp->lock, flags);
return;
} }
#ifdef MODULE #ifdef MODULE

2
drivers/net/atl1c/atl1c_ethtool.c
View file

@ -263,8 +263,6 @@ static void atl1c_get_wol(struct net_device *netdev,
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
if (adapter->wol & AT_WUFC_LNKC) if (adapter->wol & AT_WUFC_LNKC)
wol->wolopts |= WAKE_PHY; wol->wolopts |= WAKE_PHY;
return;
} }
static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

2
drivers/net/atl1c/atl1c_main.c
View file

@ -317,8 +317,6 @@ static void atl1c_common_task(struct work_struct *work)
if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE) if (adapter->work_event & ATL1C_WORK_EVENT_LINK_CHANGE)
atl1c_check_link_status(adapter); atl1c_check_link_status(adapter);
return;
} }

2
drivers/net/atl1e/atl1e_ethtool.c
View file

@ -338,8 +338,6 @@ static void atl1e_get_wol(struct net_device *netdev,
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
if (adapter->wol & AT_WUFC_LNKC) if (adapter->wol & AT_WUFC_LNKC)
wol->wolopts |= WAKE_PHY; wol->wolopts |= WAKE_PHY;
return;
} }
static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

7
drivers/net/atl1e/atl1e_main.c
View file

@ -707,8 +707,6 @@ static void atl1e_init_ring_resources(struct atl1e_adapter *adapter)
adapter->ring_vir_addr = NULL; adapter->ring_vir_addr = NULL;
adapter->rx_ring.desc = NULL; adapter->rx_ring.desc = NULL;
rwlock_init(&adapter->tx_ring.tx_lock); rwlock_init(&adapter->tx_ring.tx_lock);
return;
} }
/* /*
@ -905,8 +903,6 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size); AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size);
/* Load all of base address above */ /* Load all of base address above */
AT_WRITE_REG(hw, REG_LOAD_PTR, 1); AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
return;
} }
static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
@ -950,7 +946,6 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
(((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK) (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK)
<< TXQ_CTRL_NUM_TPD_BURST_SHIFT) << TXQ_CTRL_NUM_TPD_BURST_SHIFT)
| TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN); | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN);
return;
} }
static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
@ -1004,7 +999,6 @@ static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN; RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN;
AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data); AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
return;
} }
static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
@ -1024,7 +1018,6 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
<< DMA_CTRL_DMAW_DLY_CNT_SHIFT; << DMA_CTRL_DMAW_DLY_CNT_SHIFT;
AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data); AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data);
return;
} }
static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)

3
drivers/net/atlx/atl1.c
View file

@ -1830,8 +1830,6 @@ static void atl1_rx_checksum(struct atl1_adapter *adapter,
adapter->hw_csum_good++; adapter->hw_csum_good++;
return; return;
} }
return;
} }
/* /*
@ -3390,7 +3388,6 @@ static void atl1_get_wol(struct net_device *netdev,
wol->wolopts = 0; wol->wolopts = 0;
if (adapter->wol & ATLX_WUFC_MAG) if (adapter->wol & ATLX_WUFC_MAG)
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
return;
} }
static int atl1_set_wol(struct net_device *netdev, static int atl1_set_wol(struct net_device *netdev,

1
drivers/net/atp.c
View file

@ -802,7 +802,6 @@ static void net_rx(struct net_device *dev)
done: done:
write_reg(ioaddr, CMR1, CMR1_NextPkt); write_reg(ioaddr, CMR1, CMR1_NextPkt);
lp->last_rx_time = jiffies; lp->last_rx_time = jiffies;
return;
} }
static void read_block(long ioaddr, int length, unsigned char *p, int data_mode) static void read_block(long ioaddr, int length, unsigned char *p, int data_mode)

1
drivers/net/ax88796.c
View file

@ -303,7 +303,6 @@ static void ax_block_output(struct net_device *dev, int count,
ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }
/* definitions for accessing MII/EEPROM interface */ /* definitions for accessing MII/EEPROM interface */

3
drivers/net/benet/be_ethtool.c
View file

@ -276,8 +276,6 @@ be_get_ethtool_stats(struct net_device *netdev,
data[i] = (et_stats[i].size == sizeof(u64)) ? data[i] = (et_stats[i].size == sizeof(u64)) ?
*(u64 *)p: *(u32 *)p; *(u64 *)p: *(u32 *)p;
} }
return;
} }
static void static void
@ -466,7 +464,6 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
else else
wol->wolopts = 0; wol->wolopts = 0;
memset(&wol->sopass, 0, sizeof(wol->sopass)); memset(&wol->sopass, 0, sizeof(wol->sopass));
return;
} }
static int static int

12
drivers/net/benet/be_main.c
View file

@ -830,7 +830,6 @@ static void skb_fill_rx_data(struct be_adapter *adapter,
done: done:
be_rx_stats_update(adapter, pktsize, num_rcvd); be_rx_stats_update(adapter, pktsize, num_rcvd);
return;
} }
/* Process the RX completion indicated by rxcp when GRO is disabled */ /* 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,
} else { } else {
netif_receive_skb(skb); netif_receive_skb(skb);
} }
return;
} }
/* Process the RX completion indicated by rxcp when GRO is enabled */ /* 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,
} }
be_rx_stats_update(adapter, pkt_size, num_rcvd); be_rx_stats_update(adapter, pkt_size, num_rcvd);
return;
} }
static struct be_eth_rx_compl *be_rx_compl_get(struct be_adapter *adapter) static 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)
/* Let be_worker replenish when memory is available */ /* Let be_worker replenish when memory is available */
adapter->rx_post_starved = true; adapter->rx_post_starved = true;
} }
return;
} }
static struct be_eth_tx_compl *be_tx_compl_get(struct be_queue_info *tx_cq) static 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)
BE_NUM_MSIX_VECTORS); BE_NUM_MSIX_VECTORS);
if (status == 0) if (status == 0)
adapter->msix_enabled = true; adapter->msix_enabled = true;
return;
} }
static void be_sriov_enable(struct be_adapter *adapter) static void be_sriov_enable(struct be_adapter *adapter)
@ -1634,7 +1627,6 @@ static void be_sriov_enable(struct be_adapter *adapter)
adapter->sriov_enabled = status ? false : true; adapter->sriov_enabled = status ? false : true;
} }
#endif #endif
return;
} }
static void be_sriov_disable(struct be_adapter *adapter) static void be_sriov_disable(struct be_adapter *adapter)
@ -1741,7 +1733,6 @@ static void be_irq_unregister(struct be_adapter *adapter)
be_free_irq(adapter, &adapter->rx_eq); be_free_irq(adapter, &adapter->rx_eq);
done: done:
adapter->isr_registered = false; adapter->isr_registered = false;
return;
} }
static int be_open(struct net_device *netdev) static int be_open(struct net_device *netdev)
@ -2620,8 +2611,6 @@ static void be_shutdown(struct pci_dev *pdev)
be_setup_wol(adapter, true); be_setup_wol(adapter, true);
pci_disable_device(pdev); pci_disable_device(pdev);
return;
} }
static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev, static 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)
return; return;
err: err:
dev_err(&adapter->pdev->dev, "EEH resume failed\n"); dev_err(&adapter->pdev->dev, "EEH resume failed\n");
return;
} }
static struct pci_error_handlers be_eeh_handlers = { static struct pci_error_handlers be_eeh_handlers = {

2
drivers/net/bfin_mac.c
View file

@ -835,8 +835,6 @@ static void bfin_mac_multicast_hash(struct net_device *dev)
bfin_write_EMAC_HASHHI(emac_hashhi); bfin_write_EMAC_HASHHI(emac_hashhi);
bfin_write_EMAC_HASHLO(emac_hashlo); bfin_write_EMAC_HASHLO(emac_hashlo);
return;
} }
/* /*

3
drivers/net/bmac.c
View file

@ -167,7 +167,6 @@ static inline void
dbdma_st32(volatile __u32 __iomem *a, unsigned long x) dbdma_st32(volatile __u32 __iomem *a, unsigned long x)
{ {
__asm__ volatile( "stwbrx %0,0,%1" : : "r" (x), "r" (a) : "memory"); __asm__ volatile( "stwbrx %0,0,%1" : : "r" (x), "r" (a) : "memory");
return;
} }
static inline unsigned long static inline unsigned long
@ -382,8 +381,6 @@ bmac_init_registers(struct net_device *dev)
bmwrite(dev, RXCFG, RxCRCNoStrip | RxHashFilterEnable | RxRejectOwnPackets); bmwrite(dev, RXCFG, RxCRCNoStrip | RxHashFilterEnable | RxRejectOwnPackets);
bmwrite(dev, INTDISABLE, EnableNormal); bmwrite(dev, INTDISABLE, EnableNormal);
return;
} }
#if 0 #if 0

4
drivers/net/can/usb/ems_usb.c
View file

@ -300,8 +300,6 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
else if (err) else if (err)
dev_err(netdev->dev.parent, dev_err(netdev->dev.parent,
"failed resubmitting intr urb: %d\n", err); "failed resubmitting intr urb: %d\n", err);
return;
} }
static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg) static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
@ -497,8 +495,6 @@ resubmit_urb:
else if (retval) else if (retval)
dev_err(netdev->dev.parent, dev_err(netdev->dev.parent,
"failed resubmitting read bulk urb: %d\n", retval); "failed resubmitting read bulk urb: %d\n", retval);
return;
} }
/* /*

3
drivers/net/cnic.c
View file

@ -2092,7 +2092,6 @@ end:
i += j; i += j;
j = 1; j = 1;
} }
return;
} }
static u16 cnic_bnx2_next_idx(u16 idx) static u16 cnic_bnx2_next_idx(u16 idx)
@ -2325,7 +2324,6 @@ done:
status_idx, IGU_INT_ENABLE, 1); status_idx, IGU_INT_ENABLE, 1);
cp->kcq_prod_idx = sw_prod; cp->kcq_prod_idx = sw_prod;
return;
} }
static int cnic_service_bnx2x(void *data, void *status_blk) static int cnic_service_bnx2x(void *data, void *status_blk)
@ -4628,7 +4626,6 @@ static void __exit cnic_exit(void)
{ {
unregister_netdevice_notifier(&cnic_netdev_notifier); unregister_netdevice_notifier(&cnic_netdev_notifier);
cnic_release(); cnic_release();
return;
} }
module_init(cnic_init); module_init(cnic_init);

2
drivers/net/cs89x0.c
View file

@ -902,7 +902,6 @@ get_dma_channel(struct net_device *dev)
return; return;
} }
} }
return;
} }
static void static void
@ -1672,7 +1671,6 @@ count_rx_errors(int status, struct net_local *lp)
/* per str 172 */ /* per str 172 */
lp->stats.rx_crc_errors++; lp->stats.rx_crc_errors++;
if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++; if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++;
return;
} }
/* We have a good packet(s), get it/them out of the buffers. */ /* We have a good packet(s), get it/them out of the buffers. */

1
drivers/net/cxgb3/l2t.c
View file

@ -207,7 +207,6 @@ again:
*/ */
neigh_event_send(e->neigh, NULL); neigh_event_send(e->neigh, NULL);
} }
return;
} }
EXPORT_SYMBOL(t3_l2t_send_event); EXPORT_SYMBOL(t3_l2t_send_event);

1
drivers/net/declance.c
View file

@ -969,7 +969,6 @@ static void lance_load_multicast(struct net_device *dev)
crc = crc >> 26; crc = crc >> 26;
*lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf); *lib_ptr(ib, filter[crc >> 4], lp->type) |= 1 << (crc & 0xf);
} }
return;
} }
static void lance_set_multicast(struct net_device *dev) static void lance_set_multicast(struct net_device *dev)

6
drivers/net/depca.c
View file

@ -1203,8 +1203,6 @@ static void LoadCSRs(struct net_device *dev)
outw(ACON, DEPCA_DATA); outw(ACON, DEPCA_DATA);
outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */ outw(CSR0, DEPCA_ADDR); /* Point back to CSR0 */
return;
} }
static int InitRestartDepca(struct net_device *dev) static int InitRestartDepca(struct net_device *dev)
@ -1302,8 +1300,6 @@ static void SetMulticastFilter(struct net_device *dev)
} }
} }
} }
return;
} }
static int __init depca_common_init (u_long ioaddr, struct net_device **devp) static 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)
outw(CSR3, DEPCA_ADDR); outw(CSR3, DEPCA_ADDR);
printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA)); printk("CSR3: 0x%4.4x\n", inw(DEPCA_DATA));
} }
return;
} }
/* /*

2
drivers/net/dl2k.c
View file

@ -596,8 +596,6 @@ alloc_list (struct net_device *dev)
/* Set RFDListPtr */ /* Set RFDListPtr */
writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0); writel (np->rx_ring_dma, dev->base_addr + RFDListPtr0);
writel (0, dev->base_addr + RFDListPtr1); writel (0, dev->base_addr + RFDListPtr1);
return;
} }
static netdev_tx_t static netdev_tx_t

4
drivers/net/e1000/e1000_ethtool.c
View file

@ -1015,8 +1015,6 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
txdr->buffer_info = NULL; txdr->buffer_info = NULL;
kfree(rxdr->buffer_info); kfree(rxdr->buffer_info);
rxdr->buffer_info = NULL; rxdr->buffer_info = NULL;
return;
} }
static int e1000_setup_desc_rings(struct e1000_adapter *adapter) static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
@ -1711,8 +1709,6 @@ static void e1000_get_wol(struct net_device *netdev,
wol->wolopts |= WAKE_BCAST; wol->wolopts |= WAKE_BCAST;
if (adapter->wol & E1000_WUFC_MAG) if (adapter->wol & E1000_WUFC_MAG)
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
return;
} }
static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

2
drivers/net/e1000/e1000_main.c
View file

@ -2546,8 +2546,6 @@ set_itr_now:
adapter->itr = new_itr; adapter->itr = new_itr;
ew32(ITR, 1000000000 / (new_itr * 256)); ew32(ITR, 1000000000 / (new_itr * 256));
} }
return;
} }
#define E1000_TX_FLAGS_CSUM 0x00000001 #define E1000_TX_FLAGS_CSUM 0x00000001

4
drivers/net/e1000e/82571.c
View file

@ -1148,8 +1148,6 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
default: default:
break; break;
} }
return;
} }
/** /**
@ -1653,8 +1651,6 @@ static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)
/* If the management interface is not enabled, then power down */ /* If the management interface is not enabled, then power down */
if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw))) if (!(mac->ops.check_mng_mode(hw) || phy->ops.check_reset_block(hw)))
e1000_power_down_phy_copper(hw); e1000_power_down_phy_copper(hw);
return;
} }
/** /**

2
drivers/net/e1000e/es2lan.c
View file

@ -1383,8 +1383,6 @@ static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw)
if (!(hw->mac.ops.check_mng_mode(hw) || if (!(hw->mac.ops.check_mng_mode(hw) ||
hw->phy.ops.check_reset_block(hw))) hw->phy.ops.check_reset_block(hw)))
e1000_power_down_phy_copper(hw); e1000_power_down_phy_copper(hw);
return;
} }
/** /**

10
drivers/net/e1000e/ich8lan.c
View file

@ -690,8 +690,6 @@ static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw)
static void e1000_release_nvm_ich8lan(struct e1000_hw *hw) static void e1000_release_nvm_ich8lan(struct e1000_hw *hw)
{ {
mutex_unlock(&nvm_mutex); mutex_unlock(&nvm_mutex);
return;
} }
static DEFINE_MUTEX(swflag_mutex); static DEFINE_MUTEX(swflag_mutex);
@ -770,8 +768,6 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw)
ew32(EXTCNF_CTRL, extcnf_ctrl); ew32(EXTCNF_CTRL, extcnf_ctrl);
mutex_unlock(&swflag_mutex); mutex_unlock(&swflag_mutex);
return;
} }
/** /**
@ -2756,8 +2752,6 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
reg = er32(RFCTL); reg = er32(RFCTL);
reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS); reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
ew32(RFCTL, reg); ew32(RFCTL, reg);
return;
} }
/** /**
@ -3137,8 +3131,6 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
default: default:
break; break;
} }
return;
} }
/** /**
@ -3347,8 +3339,6 @@ static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw)
if (!(hw->mac.ops.check_mng_mode(hw) || if (!(hw->mac.ops.check_mng_mode(hw) ||
hw->phy.ops.check_reset_block(hw))) hw->phy.ops.check_reset_block(hw)))
e1000_power_down_phy_copper(hw); e1000_power_down_phy_copper(hw);
return;
} }
/** /**

4
drivers/net/e1000e/netdev.c
View file

@ -1767,8 +1767,6 @@ void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
pci_disable_msi(adapter->pdev); pci_disable_msi(adapter->pdev);
adapter->flags &= ~FLAG_MSI_ENABLED; adapter->flags &= ~FLAG_MSI_ENABLED;
} }
return;
} }
/** /**
@ -1820,8 +1818,6 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
/* Don't do anything; this is the system default */ /* Don't do anything; this is the system default */
break; break;
} }
return;
} }
/** /**

1
drivers/net/e2100.c
View file

@ -328,7 +328,6 @@ e21_reset_8390(struct net_device *dev)
/* Set up the ASIC registers, just in case something changed them. */ /* Set up the ASIC registers, just in case something changed them. */
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* Grab the 8390 specific header. We put the 2k window so the header page /* Grab the 8390 specific header. We put the 2k window so the header page

1
drivers/net/eexpress.c
View file

@ -1570,7 +1570,6 @@ static void eexp_hw_init586(struct net_device *dev)
#if NET_DEBUG > 6 #if NET_DEBUG > 6
printk("%s: leaving eexp_hw_init586()\n", dev->name); printk("%s: leaving eexp_hw_init586()\n", dev->name);
#endif #endif
return;
} }
static void eexp_setup_filter(struct net_device *dev) static void eexp_setup_filter(struct net_device *dev)

4
drivers/net/ehea/ehea_main.c
View file

@ -1881,7 +1881,6 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
port->promisc = enable; port->promisc = enable;
out: out:
free_page((unsigned long)cb7); free_page((unsigned long)cb7);
return;
} }
static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr, static 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)
} }
out: out:
ehea_update_bcmc_registrations(); ehea_update_bcmc_registrations();
return;
} }
static int ehea_change_mtu(struct net_device *dev, int new_mtu) static 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)
ehea_error("modify_ehea_port failed"); ehea_error("modify_ehea_port failed");
out: out:
free_page((unsigned long)cb1); free_page((unsigned long)cb1);
return;
} }
int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp) int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
@ -2881,7 +2878,6 @@ static void ehea_reset_port(struct work_struct *work)
netif_wake_queue(dev); netif_wake_queue(dev);
out: out:
mutex_unlock(&port->port_lock); mutex_unlock(&port->port_lock);
return;
} }
static void ehea_rereg_mrs(struct work_struct *work) static void ehea_rereg_mrs(struct work_struct *work)

4
drivers/net/epic100.c
View file

@ -652,7 +652,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int loc, int value)
if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0) if ((inl(ioaddr + MIICtrl) & MII_WRITEOP) == 0)
break; break;
} }
return;
} }
@ -840,7 +839,6 @@ static void epic_restart(struct net_device *dev)
" interrupt %4.4x.\n", " interrupt %4.4x.\n",
dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL), dev->name, (int)inl(ioaddr + COMMAND), (int)inl(ioaddr + GENCTL),
(int)inl(ioaddr + INTSTAT)); (int)inl(ioaddr + INTSTAT));
return;
} }
static void check_media(struct net_device *dev) static void check_media(struct net_device *dev)
@ -958,7 +956,6 @@ static void epic_init_ring(struct net_device *dev)
(i+1)*sizeof(struct epic_tx_desc); (i+1)*sizeof(struct epic_tx_desc);
} }
ep->tx_ring[i-1].next = ep->tx_ring_dma; ep->tx_ring[i-1].next = ep->tx_ring_dma;
return;
} }
static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) static 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)
outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4); outw(((u16 *)mc_filter)[i], ioaddr + MC0 + i*4);
memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter)); memcpy(ep->mc_filter, mc_filter, sizeof(mc_filter));
} }
return;
} }
static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info) static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)

2
drivers/net/es3210.c
View file

@ -319,8 +319,6 @@ static void es_reset_8390(struct net_device *dev)
ei_status.txing = 0; ei_status.txing = 0;
outb(0x01, ioaddr + ES_RESET_PORT); outb(0x01, ioaddr + ES_RESET_PORT);
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* /*

2
drivers/net/ewrk3.c
View file

@ -1369,8 +1369,6 @@ static void __init EthwrkSignature(char *name, char *eeprom_image)
name[EWRK3_STRLEN] = '\0'; name[EWRK3_STRLEN] = '\0';
} else } else
name[0] = '\0'; name[0] = '\0';
return;
} }
/* /*

4
drivers/net/gianfar.c
View file

@ -3009,8 +3009,6 @@ static void gfar_set_multi(struct net_device *dev)
gfar_set_hash_for_addr(dev, ha->addr); gfar_set_hash_for_addr(dev, ha->addr);
} }
} }
return;
} }
@ -3051,8 +3049,6 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
tempval = gfar_read(priv->hash_regs[whichreg]); tempval = gfar_read(priv->hash_regs[whichreg]);
tempval |= value; tempval |= value;
gfar_write(priv->hash_regs[whichreg], tempval); gfar_write(priv->hash_regs[whichreg], tempval);
return;
} }

3
drivers/net/hamachi.c
View file

@ -859,7 +859,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
for (i = 10000; i >= 0; i--) for (i = 10000; i >= 0; i--)
if ((readw(ioaddr + MII_Status) & 1) == 0) if ((readw(ioaddr + MII_Status) & 1) == 0)
break; break;
return;
} }
@ -1225,8 +1224,6 @@ static void hamachi_init_ring(struct net_device *dev)
} }
/* Mark the last entry of the ring */ /* Mark the last entry of the ring */
hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing); hmp->tx_ring[TX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing);
return;
} }

1
drivers/net/hamradio/scc.c
View file

@ -1629,7 +1629,6 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
skb->protocol = ax25_type_trans(skb, scc->dev); skb->protocol = ax25_type_trans(skb, scc->dev);
netif_rx(skb); netif_rx(skb);
return;
} }
/* ----> transmit frame <---- */ /* ----> transmit frame <---- */

4
drivers/net/hp-plus.c
View file

@ -351,7 +351,6 @@ hpp_reset_8390(struct net_device *dev)
printk("%s: hp_reset_8390() did not complete.\n", dev->name); printk("%s: hp_reset_8390() did not complete.\n", dev->name);
if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies); if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies);
return;
} }
/* The programmed-I/O version of reading the 4 byte 8390 specific header. /* 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,
int ioaddr = dev->base_addr - NIC_OFFSET; int ioaddr = dev->base_addr - NIC_OFFSET;
outw(start_page << 8, ioaddr + HPP_OUT_ADDR); outw(start_page << 8, ioaddr + HPP_OUT_ADDR);
outsl(ioaddr + HP_DATAPORT, buf, (count+3)>>2); outsl(ioaddr + HP_DATAPORT, buf, (count+3)>>2);
return;
} }
static void static void
@ -436,8 +434,6 @@ hpp_mem_block_output(struct net_device *dev, int count,
outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION); outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
memcpy_toio(ei_status.mem, buf, (count + 3) & ~3); memcpy_toio(ei_status.mem, buf, (count + 3) & ~3);
outw(option_reg, ioaddr + HPP_OPTION); outw(option_reg, ioaddr + HPP_OPTION);
return;
} }

3
drivers/net/hp.c
View file

@ -240,7 +240,6 @@ hp_reset_8390(struct net_device *dev)
printk("%s: hp_reset_8390() did not complete.\n", dev->name); printk("%s: hp_reset_8390() did not complete.\n", dev->name);
if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies); if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies);
return;
} }
static void static void
@ -360,7 +359,6 @@ hp_block_output(struct net_device *dev, int count,
dev->name, (start_page << 8) + count, addr); dev->name, (start_page << 8) + count, addr);
} }
outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE); outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE);
return;
} }
/* This function resets the ethercard if something screws up. */ /* This function resets the ethercard if something screws up. */
@ -371,7 +369,6 @@ hp_init_card(struct net_device *dev)
NS8390p_init(dev, 0); NS8390p_init(dev, 0);
outb_p(irqmap[irq&0x0f] | HP_RUN, outb_p(irqmap[irq&0x0f] | HP_RUN,
dev->base_addr - NIC_OFFSET + HP_CONFIGURE); dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
return;
} }
#ifdef MODULE #ifdef MODULE

1
drivers/net/ibmveth.c
View file

@ -1421,7 +1421,6 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter)
if (!entry) if (!entry)
ibmveth_error_printk("Cannot create adapter proc entry"); ibmveth_error_printk("Cannot create adapter proc entry");
} }
return;
} }
static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter) static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter)

2
drivers/net/igb/e1000_82575.c
View file

@ -1214,8 +1214,6 @@ void igb_power_down_phy_copper_82575(struct e1000_hw *hw)
/* If the management interface is not enabled, then power down */ /* If the management interface is not enabled, then power down */
if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw))) if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw)))
igb_power_down_phy_copper(hw); igb_power_down_phy_copper(hw);
return;
} }
/** /**

3
drivers/net/igb/igb_main.c
View file

@ -1054,7 +1054,6 @@ msi_only:
out: out:
/* Notify the stack of the (possibly) reduced Tx Queue count. */ /* Notify the stack of the (possibly) reduced Tx Queue count. */
adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; adapter->netdev->real_num_tx_queues = adapter->num_tx_queues;
return;
} }
/** /**
@ -3717,8 +3716,6 @@ set_itr_now:
q_vector->itr_val = new_itr; q_vector->itr_val = new_itr;
q_vector->set_itr = 1; q_vector->set_itr = 1;
} }
return;
} }
#define IGB_TX_FLAGS_CSUM 0x00000001 #define IGB_TX_FLAGS_CSUM 0x00000001

2
drivers/net/igbvf/ethtool.c
View file

@ -390,8 +390,6 @@ static void igbvf_get_wol(struct net_device *netdev,
{ {
wol->supported = 0; wol->supported = 0;
wol->wolopts = 0; wol->wolopts = 0;
return;
} }
static int igbvf_set_wol(struct net_device *netdev, static int igbvf_set_wol(struct net_device *netdev,

4
drivers/net/irda/mcs7780.c
View file

@ -434,8 +434,6 @@ static void mcs_unwrap_mir(struct mcs_cb *mcs, __u8 *buf, int len)
mcs->netdev->stats.rx_packets++; mcs->netdev->stats.rx_packets++;
mcs->netdev->stats.rx_bytes += new_len; mcs->netdev->stats.rx_bytes += new_len;
return;
} }
/* Unwrap received packets at FIR speed. A 32 bit crc_ccitt checksum is /* 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)
mcs->netdev->stats.rx_packets++; mcs->netdev->stats.rx_packets++;
mcs->netdev->stats.rx_bytes += new_len; mcs->netdev->stats.rx_bytes += new_len;
return;
} }

1
drivers/net/irda/smsc-ircc2.c
View file

@ -2822,7 +2822,6 @@ static void __init preconfigure_ali_port(struct pci_dev *dev,
tmpbyte |= mask; tmpbyte |= mask;
pci_write_config_byte(dev, reg, tmpbyte); pci_write_config_byte(dev, reg, tmpbyte);
IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port); IRDA_MESSAGE("Activated ALi 1533 ISA bridge port 0x%04x.\n", port);
return;
} }
static int __init preconfigure_through_ali(struct pci_dev *dev, static int __init preconfigure_through_ali(struct pci_dev *dev,

10
drivers/net/ixgb/ixgb_ee.c
View file

@ -58,7 +58,6 @@ ixgb_raise_clock(struct ixgb_hw *hw,
*eecd_reg = *eecd_reg | IXGB_EECD_SK; *eecd_reg = *eecd_reg | IXGB_EECD_SK;
IXGB_WRITE_REG(hw, EECD, *eecd_reg); IXGB_WRITE_REG(hw, EECD, *eecd_reg);
udelay(50); udelay(50);
return;
} }
/****************************************************************************** /******************************************************************************
@ -77,7 +76,6 @@ ixgb_lower_clock(struct ixgb_hw *hw,
*eecd_reg = *eecd_reg & ~IXGB_EECD_SK; *eecd_reg = *eecd_reg & ~IXGB_EECD_SK;
IXGB_WRITE_REG(hw, EECD, *eecd_reg); IXGB_WRITE_REG(hw, EECD, *eecd_reg);
udelay(50); udelay(50);
return;
} }
/****************************************************************************** /******************************************************************************
@ -127,7 +125,6 @@ ixgb_shift_out_bits(struct ixgb_hw *hw,
/* We leave the "DI" bit set to "0" when we leave this routine. */ /* We leave the "DI" bit set to "0" when we leave this routine. */
eecd_reg &= ~IXGB_EECD_DI; eecd_reg &= ~IXGB_EECD_DI;
IXGB_WRITE_REG(hw, EECD, eecd_reg); IXGB_WRITE_REG(hw, EECD, eecd_reg);
return;
} }
/****************************************************************************** /******************************************************************************
@ -192,7 +189,6 @@ ixgb_setup_eeprom(struct ixgb_hw *hw)
/* Set CS */ /* Set CS */
eecd_reg |= IXGB_EECD_CS; eecd_reg |= IXGB_EECD_CS;
IXGB_WRITE_REG(hw, EECD, eecd_reg); IXGB_WRITE_REG(hw, EECD, eecd_reg);
return;
} }
/****************************************************************************** /******************************************************************************
@ -226,7 +222,6 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
eecd_reg &= ~IXGB_EECD_SK; eecd_reg &= ~IXGB_EECD_SK;
IXGB_WRITE_REG(hw, EECD, eecd_reg); IXGB_WRITE_REG(hw, EECD, eecd_reg);
udelay(50); udelay(50);
return;
} }
/****************************************************************************** /******************************************************************************
@ -250,7 +245,6 @@ ixgb_clock_eeprom(struct ixgb_hw *hw)
eecd_reg &= ~IXGB_EECD_SK; eecd_reg &= ~IXGB_EECD_SK;
IXGB_WRITE_REG(hw, EECD, eecd_reg); IXGB_WRITE_REG(hw, EECD, eecd_reg);
udelay(50); udelay(50);
return;
} }
/****************************************************************************** /******************************************************************************
@ -270,7 +264,6 @@ ixgb_cleanup_eeprom(struct ixgb_hw *hw)
IXGB_WRITE_REG(hw, EECD, eecd_reg); IXGB_WRITE_REG(hw, EECD, eecd_reg);
ixgb_clock_eeprom(hw); ixgb_clock_eeprom(hw);
return;
} }
/****************************************************************************** /******************************************************************************
@ -359,7 +352,6 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw)
checksum = (u16) EEPROM_SUM - checksum; checksum = (u16) EEPROM_SUM - checksum;
ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum); ixgb_write_eeprom(hw, EEPROM_CHECKSUM_REG, checksum);
return;
} }
/****************************************************************************** /******************************************************************************
@ -414,8 +406,6 @@ ixgb_write_eeprom(struct ixgb_hw *hw, u16 offset, u16 data)
/* clear the init_ctrl_reg_1 to signify that the cache is invalidated */ /* clear the init_ctrl_reg_1 to signify that the cache is invalidated */
ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR); ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
return;
} }
/****************************************************************************** /******************************************************************************

17
drivers/net/ixgb/ixgb_hw.c
View file

@ -413,8 +413,6 @@ ixgb_init_rx_addrs(struct ixgb_hw *hw)
IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
} }
return;
} }
/****************************************************************************** /******************************************************************************
@ -483,7 +481,6 @@ ixgb_mc_addr_list_update(struct ixgb_hw *hw,
} }
pr_debug("MC Update Complete\n"); pr_debug("MC Update Complete\n");
return;
} }
/****************************************************************************** /******************************************************************************
@ -566,8 +563,6 @@ ixgb_mta_set(struct ixgb_hw *hw,
mta_reg |= (1 << hash_bit); mta_reg |= (1 << hash_bit);
IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg); IXGB_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta_reg);
return;
} }
/****************************************************************************** /******************************************************************************
@ -600,7 +595,6 @@ ixgb_rar_set(struct ixgb_hw *hw,
IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low); IXGB_WRITE_REG_ARRAY(hw, RA, (index << 1), rar_low);
IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high); IXGB_WRITE_REG_ARRAY(hw, RA, ((index << 1) + 1), rar_high);
return;
} }
/****************************************************************************** /******************************************************************************
@ -616,7 +610,6 @@ ixgb_write_vfta(struct ixgb_hw *hw,
u32 value) u32 value)
{ {
IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value); IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, value);
return;
} }
/****************************************************************************** /******************************************************************************
@ -631,7 +624,6 @@ ixgb_clear_vfta(struct ixgb_hw *hw)
for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++) for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++)
IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0); IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
return;
} }
/****************************************************************************** /******************************************************************************
@ -1050,7 +1042,6 @@ ixgb_clear_hw_cntrs(struct ixgb_hw *hw)
temp_reg = IXGB_READ_REG(hw, XOFFRXC); temp_reg = IXGB_READ_REG(hw, XOFFRXC);
temp_reg = IXGB_READ_REG(hw, XOFFTXC); temp_reg = IXGB_READ_REG(hw, XOFFTXC);
temp_reg = IXGB_READ_REG(hw, RJC); temp_reg = IXGB_READ_REG(hw, RJC);
return;
} }
/****************************************************************************** /******************************************************************************
@ -1066,7 +1057,6 @@ ixgb_led_on(struct ixgb_hw *hw)
/* To turn on the LED, clear software-definable pin 0 (SDP0). */ /* To turn on the LED, clear software-definable pin 0 (SDP0). */
ctrl0_reg &= ~IXGB_CTRL0_SDP0; ctrl0_reg &= ~IXGB_CTRL0_SDP0;
IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg); IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
return;
} }
/****************************************************************************** /******************************************************************************
@ -1082,7 +1072,6 @@ ixgb_led_off(struct ixgb_hw *hw)
/* To turn off the LED, set software-definable pin 0 (SDP0). */ /* To turn off the LED, set software-definable pin 0 (SDP0). */
ctrl0_reg |= IXGB_CTRL0_SDP0; ctrl0_reg |= IXGB_CTRL0_SDP0;
IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg); IXGB_WRITE_REG(hw, CTRL0, ctrl0_reg);
return;
} }
/****************************************************************************** /******************************************************************************
@ -1122,8 +1111,6 @@ ixgb_get_bus_info(struct ixgb_hw *hw)
hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ? hw->bus.width = (status_reg & IXGB_STATUS_BUS64) ?
ixgb_bus_width_64 : ixgb_bus_width_32; ixgb_bus_width_64 : ixgb_bus_width_32;
return;
} }
/****************************************************************************** /******************************************************************************
@ -1210,8 +1197,6 @@ ixgb_optics_reset(struct ixgb_hw *hw)
IXGB_PHY_ADDRESS, IXGB_PHY_ADDRESS,
MDIO_MMD_PMAPMD); MDIO_MMD_PMAPMD);
} }
return;
} }
/****************************************************************************** /******************************************************************************
@ -1272,6 +1257,4 @@ ixgb_optics_reset_bcm(struct ixgb_hw *hw)
/* SerDes needs extra delay */ /* SerDes needs extra delay */
msleep(IXGB_SUN_PHY_RESET_DELAY); msleep(IXGB_SUN_PHY_RESET_DELAY);
return;
} }

1
drivers/net/ixgbe/ixgbe_dcb_nl.c
View file

@ -488,7 +488,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
if (adapter->temp_dcb_cfg.pfc_mode_enable != if (adapter->temp_dcb_cfg.pfc_mode_enable !=
adapter->dcb_cfg.pfc_mode_enable) adapter->dcb_cfg.pfc_mode_enable)
adapter->dcb_set_bitmap |= BIT_PFC; adapter->dcb_set_bitmap |= BIT_PFC;
return;
} }
/** /**

4
drivers/net/ixgbe/ixgbe_ethtool.c
View file

@ -1493,8 +1493,6 @@ static void ixgbe_free_desc_rings(struct ixgbe_adapter *adapter)
tx_ring->tx_buffer_info = NULL; tx_ring->tx_buffer_info = NULL;
kfree(rx_ring->rx_buffer_info); kfree(rx_ring->rx_buffer_info);
rx_ring->rx_buffer_info = NULL; rx_ring->rx_buffer_info = NULL;
return;
} }
static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
@ -1973,8 +1971,6 @@ static void ixgbe_get_wol(struct net_device *netdev,
wol->wolopts |= WAKE_BCAST; wol->wolopts |= WAKE_BCAST;
if (adapter->wol & IXGBE_WUFC_MAG) if (adapter->wol & IXGBE_WUFC_MAG)
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
return;
} }
static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

5
drivers/net/ixgbe/ixgbe_main.c
View file

@ -1615,8 +1615,6 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector)
ixgbe_write_eitr(q_vector); ixgbe_write_eitr(q_vector);
} }
return;
} }
static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr) static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)
@ -2180,8 +2178,6 @@ static void ixgbe_set_itr(struct ixgbe_adapter *adapter)
ixgbe_write_eitr(q_vector); ixgbe_write_eitr(q_vector);
} }
return;
} }
/** /**
@ -4466,7 +4462,6 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED; adapter->flags &= ~IXGBE_FLAG_MSI_ENABLED;
pci_disable_msi(adapter->pdev); pci_disable_msi(adapter->pdev);
} }
return;
} }
/** /**

4
drivers/net/ixgbevf/ixgbevf_main.c
View file

@ -946,8 +946,6 @@ static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector)
itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr); itr_reg = EITR_INTS_PER_SEC_TO_REG(new_itr);
ixgbevf_write_eitr(adapter, v_idx, itr_reg); ixgbevf_write_eitr(adapter, v_idx, itr_reg);
} }
return;
} }
static irqreturn_t ixgbevf_msix_mbx(int irq, void *data) static irqreturn_t ixgbevf_msix_mbx(int irq, void *data)
@ -2151,8 +2149,6 @@ static void ixgbevf_reset_interrupt_capability(struct ixgbevf_adapter *adapter)
pci_disable_msix(adapter->pdev); pci_disable_msix(adapter->pdev);
kfree(adapter->msix_entries); kfree(adapter->msix_entries);
adapter->msix_entries = NULL; adapter->msix_entries = NULL;
return;
} }
/** /**

4
drivers/net/jme.c
View file

@ -103,8 +103,6 @@ jme_mdio_write(struct net_device *netdev,
if (i == 0) if (i == 0)
jeprintk(jme->pdev, "phy(%d) write timeout : %d\n", phy, reg); jeprintk(jme->pdev, "phy(%d) write timeout : %d\n", phy, reg);
return;
} }
static inline void static inline void
@ -130,8 +128,6 @@ jme_reset_phy_processor(struct jme_adapter *jme)
jme_mdio_write(jme->dev, jme_mdio_write(jme->dev,
jme->mii_if.phy_id, jme->mii_if.phy_id,
MII_BMCR, val | BMCR_RESET); MII_BMCR, val | BMCR_RESET);
return;
} }
static void static void

1
drivers/net/lib8390.c
View file

@ -791,7 +791,6 @@ static void ei_receive(struct net_device *dev)
/* We used to also ack ENISR_OVER here, but that would sometimes mask /* We used to also ack ENISR_OVER here, but that would sometimes mask
a real overrun, leaving the 8390 in a stopped state with rec'vr off. */ a real overrun, leaving the 8390 in a stopped state with rec'vr off. */
ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR); ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR);
return;
} }
/** /**

2
drivers/net/lne390.c
View file

@ -307,8 +307,6 @@ static void lne390_reset_8390(struct net_device *dev)
ei_status.txing = 0; ei_status.txing = 0;
outb(0x01, ioaddr + LNE390_RESET_PORT); outb(0x01, ioaddr + LNE390_RESET_PORT);
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* /*

2
drivers/net/mac8390.c
View file

@ -661,7 +661,6 @@ static void mac8390_no_reset(struct net_device *dev)
ei_status.txing = 0; ei_status.txing = 0;
if (ei_debug > 1) if (ei_debug > 1)
pr_info("reset not supported\n"); pr_info("reset not supported\n");
return;
} }
static void interlan_reset(struct net_device *dev) static void interlan_reset(struct net_device *dev)
@ -673,7 +672,6 @@ static void interlan_reset(struct net_device *dev)
target[0xC0000] = 0; target[0xC0000] = 0;
if (ei_debug > 1) if (ei_debug > 1)
pr_cont("reset complete\n"); pr_cont("reset complete\n");
return;
} }
/* dayna_memcpy_fromio/dayna_memcpy_toio */ /* dayna_memcpy_fromio/dayna_memcpy_toio */

2
drivers/net/meth.c
View file

@ -748,8 +748,6 @@ static void meth_tx_timeout(struct net_device *dev)
dev->trans_start = jiffies; /* prevent tx timeout */ dev->trans_start = jiffies; /* prevent tx timeout */
netif_wake_queue(dev); netif_wake_queue(dev);
return;
} }
/* /*

2
drivers/net/mlx4/en_ethtool.c
View file

@ -140,8 +140,6 @@ static void mlx4_en_get_wol(struct net_device *netdev,
{ {
wol->supported = 0; wol->supported = 0;
wol->wolopts = 0; wol->wolopts = 0;
return;
} }
static int mlx4_en_get_sset_count(struct net_device *dev, int sset) static int mlx4_en_get_sset_count(struct net_device *dev, int sset)

1
drivers/net/ne-h8300.c
View file

@ -608,7 +608,6 @@ retry:
outb_p(ENISR_RDC, NE_BASE + EN0_ISR); /* Ack intr. */ outb_p(ENISR_RDC, NE_BASE + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }

1
drivers/net/ne.c
View file

@ -785,7 +785,6 @@ retry:
outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }
static int __init ne_drv_probe(struct platform_device *pdev) static int __init ne_drv_probe(struct platform_device *pdev)

1
drivers/net/ne2.c
View file

@ -730,7 +730,6 @@ retry:
outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ outb_p(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }

1
drivers/net/ne2k-pci.c
View file

@ -631,7 +631,6 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,
outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */ outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01; ei_status.dmaing &= ~0x01;
return;
} }
static void ne2k_pci_get_drvinfo(struct net_device *dev, static void ne2k_pci_get_drvinfo(struct net_device *dev,

2
drivers/net/ne3210.c
View file

@ -255,8 +255,6 @@ static void ne3210_reset_8390(struct net_device *dev)
ei_status.txing = 0; ei_status.txing = 0;
outb(0x01, ioaddr + NE3210_RESET_PORT); outb(0x01, ioaddr + NE3210_RESET_PORT);
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* /*

1
drivers/net/netxen/netxen_nic_init.c
View file

@ -1901,6 +1901,5 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
void netxen_nic_clear_stats(struct netxen_adapter *adapter) void netxen_nic_clear_stats(struct netxen_adapter *adapter)
{ {
memset(&adapter->stats, 0, sizeof(adapter->stats)); memset(&adapter->stats, 0, sizeof(adapter->stats));
return;
} }

1
drivers/net/netxen/netxen_nic_main.c
View file

@ -2781,7 +2781,6 @@ netxen_config_indev_addr(struct net_device *dev, unsigned long event)
} endfor_ifa(indev); } endfor_ifa(indev);
in_dev_put(indev); in_dev_put(indev);
return;
} }
static int netxen_netdev_event(struct notifier_block *this, static int netxen_netdev_event(struct notifier_block *this,

2
drivers/net/ni5010.c
View file

@ -514,8 +514,6 @@ static void dump_packet(void *buf, int len)
if (i % 16 == 15) printk("\n"); if (i % 16 == 15) printk("\n");
} }
printk("\n"); printk("\n");
return;
} }
/* We have a good packet, get it out of the buffer. */ /* We have a good packet, get it out of the buffer. */

1
drivers/net/octeon/octeon_mgmt.c
View file

@ -1005,7 +1005,6 @@ static void octeon_mgmt_poll_controller(struct net_device *netdev)
octeon_mgmt_receive_packets(p, 16); octeon_mgmt_receive_packets(p, 16);
octeon_mgmt_update_rx_stats(netdev); octeon_mgmt_update_rx_stats(netdev);
return;
} }
#endif #endif

2
drivers/net/pasemi_mac.c
View file

@ -1472,8 +1472,6 @@ static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
txring->next_to_fill = fill; txring->next_to_fill = fill;
write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2); write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
return;
} }
static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)

2
drivers/net/pcmcia/3c574_cs.c
View file

@ -622,8 +622,6 @@ static void mdio_write(unsigned int ioaddr, int phy_id, int location, int value)
outw(MDIO_ENB_IN, mdio_addr); outw(MDIO_ENB_IN, mdio_addr);
outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr);
} }
return;
} }
/* Reset and restore all of the 3c574 registers. */ /* Reset and restore all of the 3c574 registers. */

2
drivers/net/pcmcia/axnet_cs.c
View file

@ -1510,8 +1510,6 @@ static void ei_receive(struct net_device *dev)
ei_local->current_page = next_frame; ei_local->current_page = next_frame;
outb_p(next_frame-1, e8390_base+EN0_BOUNDARY); outb_p(next_frame-1, e8390_base+EN0_BOUNDARY);
} }
return;
} }
/** /**

2
drivers/net/pcmcia/fmvj18x_cs.c
View file

@ -1081,8 +1081,6 @@ static void fjn_rx(struct net_device *dev)
"%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i); "%d ticks.\n", dev->name, inb(ioaddr + RX_MODE), i);
} }
*/ */
return;
} /* fjn_rx */ } /* fjn_rx */
/*====================================================================*/ /*====================================================================*/

2
drivers/net/pcmcia/ibmtr_cs.c
View file

@ -402,8 +402,6 @@ static void ibmtr_hw_setup(struct net_device *dev, u_int mmiobase)
/* 0x40 will release the card for use */ /* 0x40 will release the card for use */
outb(0x40, dev->base_addr); outb(0x40, dev->base_addr);
return;
} }
static struct pcmcia_device_id ibmtr_ids[] = { static struct pcmcia_device_id ibmtr_ids[] = {

2
drivers/net/pcmcia/nmclan_cs.c
View file

@ -1313,8 +1313,6 @@ static void update_stats(unsigned int ioaddr, struct net_device *dev)
lp->linux_stats.tx_fifo_errors = lp->mace_stats.uflo; lp->linux_stats.tx_fifo_errors = lp->mace_stats.uflo;
lp->linux_stats.tx_heartbeat_errors = lp->mace_stats.cerr; lp->linux_stats.tx_heartbeat_errors = lp->mace_stats.cerr;
/* lp->linux_stats.tx_window_errors; */ /* lp->linux_stats.tx_window_errors; */
return;
} /* update_stats */ } /* update_stats */
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------

6
drivers/net/pcmcia/smc91c92_cs.c
View file

@ -1239,7 +1239,6 @@ static void smc_hardware_send_packet(struct net_device * dev)
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
dev->trans_start = jiffies; dev->trans_start = jiffies;
netif_start_queue(dev); netif_start_queue(dev);
return;
} }
/*====================================================================*/ /*====================================================================*/
@ -1369,7 +1368,6 @@ static void smc_tx_err(struct net_device * dev)
smc->packets_waiting--; smc->packets_waiting--;
outw(saved_packet, ioaddr + PNR_ARR); outw(saved_packet, ioaddr + PNR_ARR);
return;
} }
/*====================================================================*/ /*====================================================================*/
@ -1589,8 +1587,6 @@ static void smc_rx(struct net_device *dev)
} }
/* Let the MMU free the memory of this packet. */ /* Let the MMU free the memory of this packet. */
outw(MC_RELEASE, ioaddr + MMU_CMD); outw(MC_RELEASE, ioaddr + MMU_CMD);
return;
} }
/*====================================================================== /*======================================================================
@ -1640,8 +1636,6 @@ static void set_rx_mode(struct net_device *dev)
outw(rx_cfg_setting, ioaddr + RCR); outw(rx_cfg_setting, ioaddr + RCR);
SMC_SELECT_BANK(2); SMC_SELECT_BANK(2);
spin_unlock_irqrestore(&smc->lock, flags); spin_unlock_irqrestore(&smc->lock, flags);
return;
} }
/*====================================================================== /*======================================================================

3
drivers/net/pcnet32.c
View file

@ -647,7 +647,6 @@ free_new_rx_ring:
(1 << size), (1 << size),
new_rx_ring, new_rx_ring,
new_ring_dma_addr); new_ring_dma_addr);
return;
} }
static void pcnet32_purge_rx_ring(struct net_device *dev) static void pcnet32_purge_rx_ring(struct net_device *dev)
@ -1215,7 +1214,6 @@ static void pcnet32_rx_entry(struct net_device *dev,
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
netif_receive_skb(skb); netif_receive_skb(skb);
dev->stats.rx_packets++; dev->stats.rx_packets++;
return;
} }
static int pcnet32_rx(struct net_device *dev, int budget) static int pcnet32_rx(struct net_device *dev, int budget)
@ -2623,7 +2621,6 @@ static void pcnet32_load_multicast(struct net_device *dev)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i, lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
le16_to_cpu(mcast_table[i])); le16_to_cpu(mcast_table[i]));
return;
} }
/* /*

3
drivers/net/phy/national.c
View file

@ -97,7 +97,6 @@ static void ns_giga_speed_fallback(struct phy_device *phydev, int mode)
phy_write(phydev, NS_EXP_MEM_DATA, 0x0008); phy_write(phydev, NS_EXP_MEM_DATA, 0x0008);
phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN)); phy_write(phydev, MII_BMCR, (bmcr & ~BMCR_PDOWN));
phy_write(phydev, LED_CTRL_REG, mode); phy_write(phydev, LED_CTRL_REG, mode);
return;
} }
static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) static 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)
printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n", printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n",
(ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
return;
} }
static int ns_config_init(struct phy_device *phydev) static int ns_config_init(struct phy_device *phydev)

3
drivers/net/plip.c
View file

@ -1191,8 +1191,6 @@ plip_wakeup(void *handle)
/* Clear the data port. */ /* Clear the data port. */
write_data (dev, 0x00); write_data (dev, 0x00);
} }
return;
} }
static int static int
@ -1308,7 +1306,6 @@ err_parport_unregister:
parport_unregister_device(nl->pardev); parport_unregister_device(nl->pardev);
err_free_dev: err_free_dev:
free_netdev(dev); free_netdev(dev);
return;
} }
/* plip_detach() is called (by the parport code) when a port is /* plip_detach() is called (by the parport code) when a port is

1
drivers/net/ps3_gelic_wireless.c
View file

@ -301,7 +301,6 @@ static void gelic_wl_get_ch_info(struct gelic_wl_info *wl)
/* 16 bits of MSB has available channels */ /* 16 bits of MSB has available channels */
wl->ch_info = ch_info_raw >> 48; wl->ch_info = ch_info_raw >> 48;
} }
return;
} }
/* SIOGIWRANGE */ /* SIOGIWRANGE */

6
drivers/net/qla3xxx.c
View file

@ -222,7 +222,6 @@ static void ql_write_common_reg_l(struct ql3_adapter *qdev,
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
return;
} }
static void ql_write_common_reg(struct ql3_adapter *qdev, static void ql_write_common_reg(struct ql3_adapter *qdev,
@ -230,7 +229,6 @@ static void ql_write_common_reg(struct ql3_adapter *qdev,
{ {
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
return;
} }
static void ql_write_nvram_reg(struct ql3_adapter *qdev, static void ql_write_nvram_reg(struct ql3_adapter *qdev,
@ -239,7 +237,6 @@ static void ql_write_nvram_reg(struct ql3_adapter *qdev,
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
udelay(1); udelay(1);
return;
} }
static void ql_write_page0_reg(struct ql3_adapter *qdev, static void ql_write_page0_reg(struct ql3_adapter *qdev,
@ -249,7 +246,6 @@ static void ql_write_page0_reg(struct ql3_adapter *qdev,
ql_set_register_page(qdev,0); ql_set_register_page(qdev,0);
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
return;
} }
/* /*
@ -262,7 +258,6 @@ static void ql_write_page1_reg(struct ql3_adapter *qdev,
ql_set_register_page(qdev,1); ql_set_register_page(qdev,1);
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
return;
} }
/* /*
@ -275,7 +270,6 @@ static void ql_write_page2_reg(struct ql3_adapter *qdev,
ql_set_register_page(qdev,2); ql_set_register_page(qdev,2);
writel(value, reg); writel(value, reg);
readl(reg); readl(reg);
return;
} }
static void ql_disable_interrupts(struct ql3_adapter *qdev) static void ql_disable_interrupts(struct ql3_adapter *qdev)

2
drivers/net/qlcnic/qlcnic_main.c
View file

@ -239,7 +239,6 @@ qlcnic_napi_disable(struct qlcnic_adapter *adapter)
static void qlcnic_clear_stats(struct qlcnic_adapter *adapter) static void qlcnic_clear_stats(struct qlcnic_adapter *adapter)
{ {
memset(&adapter->stats, 0, sizeof(adapter->stats)); memset(&adapter->stats, 0, sizeof(adapter->stats));
return;
} }
static int qlcnic_set_dma_mask(struct qlcnic_adapter *adapter) static int qlcnic_set_dma_mask(struct qlcnic_adapter *adapter)
@ -2662,7 +2661,6 @@ qlcnic_config_indev_addr(struct net_device *dev, unsigned long event)
} endfor_ifa(indev); } endfor_ifa(indev);
in_dev_put(indev); in_dev_put(indev);
return;
} }
static int qlcnic_netdev_event(struct notifier_block *this, static int qlcnic_netdev_event(struct notifier_block *this,

2
drivers/net/qlge/qlge_ethtool.c
View file

@ -181,8 +181,6 @@ quit:
spin_unlock(&qdev->stats_lock); spin_unlock(&qdev->stats_lock);
QL_DUMP_STAT(qdev); QL_DUMP_STAT(qdev);
return;
} }
static char ql_stats_str_arr[][ETH_GSTRING_LEN] = { static char ql_stats_str_arr[][ETH_GSTRING_LEN] = {

3
drivers/net/s2io.c
View file

@ -2943,7 +2943,6 @@ static void s2io_netpoll(struct net_device *dev)
} }
} }
enable_irq(dev->irq); enable_irq(dev->irq);
return;
} }
#endif #endif
@ -4756,7 +4755,6 @@ reset:
s2io_stop_all_tx_queue(sp); s2io_stop_all_tx_queue(sp);
schedule_work(&sp->rst_timer_task); schedule_work(&sp->rst_timer_task);
sw_stat->soft_reset_cnt++; sw_stat->soft_reset_cnt++;
return;
} }
/** /**
@ -8645,7 +8643,6 @@ static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
first->truesize += skb->truesize; first->truesize += skb->truesize;
lro->last_frag = skb; lro->last_frag = skb;
swstats->clubbed_frms_cnt++; swstats->clubbed_frms_cnt++;
return;
} }
/** /**

5
drivers/net/sb1000.c
View file

@ -426,7 +426,6 @@ sb1000_send_command(const int ioaddr[], const char* name,
if (sb1000_debug > 3) if (sb1000_debug > 3)
printk(KERN_DEBUG "%s: sb1000_send_command out: %02x%02x%02x%02x" printk(KERN_DEBUG "%s: sb1000_send_command out: %02x%02x%02x%02x"
"%02x%02x\n", name, out[0], out[1], out[2], out[3], out[4], out[5]); "%02x%02x\n", name, out[0], out[1], out[2], out[3], out[4], out[5]);
return;
} }
/* Card Read Status (to be used during frame rx) */ /* Card Read Status (to be used during frame rx) */
@ -438,7 +437,6 @@ sb1000_read_status(const int ioaddr[], unsigned char in[])
in[3] = inb(ioaddr[0] + 3); in[3] = inb(ioaddr[0] + 3);
in[4] = inb(ioaddr[0] + 4); in[4] = inb(ioaddr[0] + 4);
in[0] = inb(ioaddr[0] + 5); in[0] = inb(ioaddr[0] + 5);
return;
} }
/* Issue Read Command (to be used during frame rx) */ /* Issue Read Command (to be used during frame rx) */
@ -450,7 +448,6 @@ sb1000_issue_read_command(const int ioaddr[], const char* name)
sb1000_wait_for_ready_clear(ioaddr, name); sb1000_wait_for_ready_clear(ioaddr, name);
outb(0xa0, ioaddr[0] + 6); outb(0xa0, ioaddr[0] + 6);
sb1000_send_command(ioaddr, name, Command0); sb1000_send_command(ioaddr, name, Command0);
return;
} }
@ -733,7 +730,6 @@ sb1000_print_status_buffer(const char* name, unsigned char st[],
printk("\n"); printk("\n");
} }
} }
return;
} }
/* /*
@ -926,7 +922,6 @@ sb1000_error_dpc(struct net_device *dev)
sb1000_read_status(ioaddr, st); sb1000_read_status(ioaddr, st);
if (st[1] & 0x10) if (st[1] & 0x10)
lp->rx_error_dpc_count = ErrorDpcCounterInitialize; lp->rx_error_dpc_count = ErrorDpcCounterInitialize;
return;
} }

1
drivers/net/seeq8005.c
View file

@ -578,7 +578,6 @@ static void seeq8005_rx(struct net_device *dev)
/* If any worth-while packets have been received, netif_rx() /* If any worth-while packets have been received, netif_rx()
has done a mark_bh(NET_BH) for us and will work on them has done a mark_bh(NET_BH) for us and will work on them
when we get to the bottom-half routine. */ when we get to the bottom-half routine. */
return;
} }
/* The inverse routine to net_open(). */ /* The inverse routine to net_open(). */

7
drivers/net/sis900.c
View file

@ -858,7 +858,6 @@ static void mdio_reset(long mdio_addr)
outl(MDDIR | MDIO | MDC, mdio_addr); outl(MDDIR | MDIO | MDC, mdio_addr);
mdio_delay(); mdio_delay();
} }
return;
} }
/** /**
@ -953,8 +952,6 @@ static void mdio_write(struct net_device *net_dev, int phy_id, int location,
mdio_delay(); mdio_delay();
} }
outl(0x00, mdio_addr); outl(0x00, mdio_addr);
return;
} }
@ -1264,7 +1261,6 @@ static void sis630_set_eq(struct net_device *net_dev, u8 revision)
mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, mdio_write(net_dev, sis_priv->cur_phy, MII_RESV,
(reg14h | 0x2000) & 0xBFFF); (reg14h | 0x2000) & 0xBFFF);
} }
return;
} }
/** /**
@ -1560,7 +1556,6 @@ static void sis900_tx_timeout(struct net_device *net_dev)
/* Enable all known interrupts by setting the interrupt mask. */ /* Enable all known interrupts by setting the interrupt mask. */
outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
return;
} }
/** /**
@ -2330,8 +2325,6 @@ static void set_rx_mode(struct net_device *net_dev)
/* restore cr */ /* restore cr */
outl(cr_saved, ioaddr + cr); outl(cr_saved, ioaddr + cr);
} }
return;
} }
/** /**

2
drivers/net/skfp/skfddi.c
View file

@ -844,7 +844,6 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
spin_lock_irqsave(&bp->DriverLock, Flags); spin_lock_irqsave(&bp->DriverLock, Flags);
skfp_ctl_set_multicast_list_wo_lock(dev); skfp_ctl_set_multicast_list_wo_lock(dev);
spin_unlock_irqrestore(&bp->DriverLock, Flags); spin_unlock_irqrestore(&bp->DriverLock, Flags);
return;
} // skfp_ctl_set_multicast_list } // skfp_ctl_set_multicast_list
@ -898,7 +897,6 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
/* Update adapter filters */ /* Update adapter filters */
mac_update_multicast(smc); mac_update_multicast(smc);
} }
return;
} // skfp_ctl_set_multicast_list_wo_lock } // skfp_ctl_set_multicast_list_wo_lock

1
drivers/net/slhc.c
View file

@ -731,7 +731,6 @@ void
slhc_free(struct slcompress *comp) slhc_free(struct slcompress *comp)
{ {
printk(KERN_DEBUG "Called IP function on non IP-system: slhc_free"); printk(KERN_DEBUG "Called IP function on non IP-system: slhc_free");
return;
} }
struct slcompress * struct slcompress *
slhc_init(int rslots, int tslots) slhc_init(int rslots, int tslots)

1
drivers/net/smc-mca.c
View file

@ -460,7 +460,6 @@ static void ultramca_reset_8390(struct net_device *dev)
if (ei_debug > 1) if (ei_debug > 1)
printk("reset done\n"); printk("reset done\n");
return;
} }
/* Grab the 8390 specific header. Similar to the block_input routine, but /* Grab the 8390 specific header. Similar to the block_input routine, but

1
drivers/net/smc-ultra.c
View file

@ -421,7 +421,6 @@ ultra_reset_8390(struct net_device *dev)
outb(0x01, cmd_port + 6); /* Enable interrupts and memory. */ outb(0x01, cmd_port + 6); /* Enable interrupts and memory. */
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* Grab the 8390 specific header. Similar to the block_input routine, but /* Grab the 8390 specific header. Similar to the block_input routine, but

1
drivers/net/smc-ultra32.c
View file

@ -352,7 +352,6 @@ static void ultra32_reset_8390(struct net_device *dev)
outb(0x84, ioaddr + 5); /* Enable MEM16 & Disable Bus Master. */ outb(0x84, ioaddr + 5); /* Enable MEM16 & Disable Bus Master. */
outb(0x01, ioaddr + 6); /* Enable Interrupts. */ outb(0x01, ioaddr + 6); /* Enable Interrupts. */
if (ei_debug > 1) printk("reset done\n"); if (ei_debug > 1) printk("reset done\n");
return;
} }
/* Grab the 8390 specific header. Similar to the block_input routine, but /* Grab the 8390 specific header. Similar to the block_input routine, but

Some files were not shown because too many files have changed in this diff Show more