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

[net-next-2.6.git] / drivers / net / tokenring / tms380tr.c

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 8cb126a800702018899362395e32814e3367242f..435ef7d5470fd8e8e6c4849c1d3dc930a13e1b3f 100644 (file)
--- 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)
                tp->Sleeping = 0;
                wake_up_interruptible(&tp->wait_for_tok_int);
        }
-
-       return;
 }
 
 /*
@@ -460,8 +458,6 @@ static void tms380tr_init_net_local(struct net_device *dev)
        tp->RplHead = &tp->Rpl[0];
        tp->RplTail = &tp->Rpl[RPL_NUM-1];
        tp->RplTail->Status = (RX_START_FRAME | RX_END_FRAME | RX_FRAME_IRQ);
-
-       return;
 }
 
 /*
@@ -481,8 +477,6 @@ static void tms380tr_init_ipb(struct net_local *tp)
        tp->ipb.DMA_Abort_Thrhld = DMA_RETRIES;
        tp->ipb.SCB_Addr        = 0;
        tp->ipb.SSB_Addr        = 0;
-
-       return;
 }
 
 /*
@@ -527,8 +521,6 @@ static void tms380tr_init_opb(struct net_device *dev)
 
        tp->ocpl.ProdIDAddr[0]   = LOWORD(Addr);
        tp->ocpl.ProdIDAddr[1]   = HIWORD(Addr);
-
-       return;
 }
 
 /*
@@ -543,8 +535,6 @@ static void tms380tr_open_adapter(struct net_device *dev)
 
        tp->OpenCommandIssued = 1;
        tms380tr_exec_cmd(dev, OC_OPEN);
-
-       return;
 }
 
 /*
@@ -554,8 +544,6 @@ static void tms380tr_open_adapter(struct net_device *dev)
 static void tms380tr_disable_interrupts(struct net_device *dev)
 {
        SIFWRITEB(0, SIFACL);
-
-       return;
 }
 
 /*
@@ -565,8 +553,6 @@ static void tms380tr_disable_interrupts(struct net_device *dev)
 static void tms380tr_enable_interrupts(struct net_device *dev)
 {
        SIFWRITEB(ACL_SINTEN, SIFACL);
-
-       return;
 }
 
 /*
@@ -578,8 +564,6 @@ static void tms380tr_exec_cmd(struct net_device *dev, unsigned short Command)
 
        tp->CMDqueue |= Command;
        tms380tr_chk_outstanding_cmds(dev);
-
-       return;
 }
 
 static void tms380tr_timeout(struct net_device *dev)
@@ -712,8 +696,6 @@ static void tms380tr_chk_src_addr(unsigned char *frame, unsigned char *hw_addr)
        SRBit = frame[8] & 0x80;
        memcpy(&frame[8], hw_addr, 6);
        frame[8] |= SRBit;
-
-       return;
 }
 
 /*
@@ -743,8 +725,6 @@ static void tms380tr_timer_chk(unsigned long data)
                return;
        tp->ReOpenInProgress = 1;
        tms380tr_open_adapter(dev);
-
-       return;
 }
 
 /*
@@ -863,8 +843,6 @@ static void tms380tr_reset_interrupt(struct net_device *dev)
         * and clear STS_SYSTEM_IRQ bit: enable adapter for further interrupts.
         */
        tms380tr_exec_sifcmd(dev, CMD_SSB_CLEAR | CMD_CLEAR_SYSTEM_IRQ);
-
-       return;
 }
 
 /*
@@ -1119,8 +1097,6 @@ static void tms380tr_cmd_status_irq(struct net_device *dev)
                tp->MacStat.frequency_errors += tp->errorlogtable.Frequency_Error;
                tp->MacStat.internal_errors += tp->errorlogtable.Internal_Error;
        }
-
-       return;
 }
 
 /*
@@ -1229,7 +1205,6 @@ static void tms380tr_set_multicast_list(struct net_device *dev)
        
        tp->ocpl.OPENOptions = OpenOptions;
        tms380tr_exec_cmd(dev, OC_MODIFY_OPEN_PARMS);
-       return;
 }
 
 /*
@@ -1247,7 +1222,6 @@ void tms380tr_wait(unsigned long time)
 #else
        udelay(time);
 #endif
-       return;
 }
 
 /*
@@ -1266,8 +1240,6 @@ static void tms380tr_exec_sifcmd(struct net_device *dev, unsigned int WriteValue
                SifStsValue = SIFREADW(SIFSTS);
        } while((SifStsValue & CMD_INTERRUPT_ADAPTER) && loop_counter--);
        SIFWRITEW(cmd, SIFCMD);
-
-       return;
 }
 
 /*
@@ -1700,8 +1672,6 @@ static void tms380tr_chk_outstanding_cmds(struct net_device *dev)
 
        /* Execute SCB and generate IRQ when done. */
        tms380tr_exec_sifcmd(dev, CMD_EXECUTE | CMD_SCB_REQUEST);
-
-       return;
 }
 
 /*
@@ -1774,8 +1744,6 @@ static void tms380tr_ring_status_irq(struct net_device *dev)
                tp->AdapterOpenFlag = 0;
                tms380tr_open_adapter(dev);
        }
-
-       return;
 }
 
 /*
@@ -1932,8 +1900,6 @@ static void tms380tr_chk_irq(struct net_device *dev)
                /* Restart of firmware successful */
                tp->AdapterOpenFlag = 1;
        }
-
-       return;
 }
 
 /*
@@ -1988,8 +1954,6 @@ static void tms380tr_read_ram(struct net_device *dev, unsigned char *Data,
        /* Restore original values */
        SIFWRITEW(old_sifadx, SIFADX);
        SIFWRITEW(old_sifadr, SIFADR);
-
-       return;
 }
 
 /*
@@ -2021,8 +1985,6 @@ static void tms380tr_cancel_tx_queue(struct net_local* tp)
                        dma_unmap_single(tp->pdev, tpl->DMABuff, tpl->Skb->len, DMA_TO_DEVICE);
                dev_kfree_skb_any(tpl->Skb);
        }
-
-       return;
 }
 
 /*
@@ -2094,7 +2056,6 @@ static void tms380tr_tx_status_irq(struct net_device *dev)
 
        if(!tp->TplFree->NextTPLPtr->BusyFlag)
                netif_wake_queue(dev);
-       return;
 }
 
 /*
@@ -2255,8 +2216,6 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
                /* Inform adapter about RPL valid. */
                tms380tr_exec_sifcmd(dev, CMD_RX_VALID);
        }
-
-       return;
 }
 
 /*
@@ -2269,8 +2228,6 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
 static void tms380tr_write_rpl_status(RPL *rpl, unsigned int Status)
 {
        rpl->Status = Status;
-
-       return;
 }
 
 /*
@@ -2287,8 +2244,6 @@ static void tms380tr_update_rcv_stats(struct net_local *tp, unsigned char DataPt
        /* Test functional bit */
        if(DataPtr[2] & GROUP_BIT)
                tp->MacStat.multicast++;
-
-       return;
 }
 
 static int tms380tr_set_mac_address(struct net_device *dev, void *addr)
@@ -2318,8 +2273,6 @@ static void tms380tr_dump(unsigned char *Data, int length)
                       Data[j+0],Data[j+1],Data[j+2],Data[j+3],
                       Data[j+4],Data[j+5],Data[j+6],Data[j+7]);
        }
-
-       return;
 }
 #endif