Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 86444
b: refs/heads/master
c: 98e0f52
h: refs/heads/master
v: v3
  • Loading branch information
Harvey Harrison authored and Jeff Garzik committed Feb 24, 2008
1 parent b8ac57d commit 2de6aa5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5154fbf4902744cdd2bb7548487ceaac9840fd2
refs/heads/master: 98e0f521456943801aacc7a4c0efb5b3bb6f89e0
64 changes: 32 additions & 32 deletions trunk/drivers/net/tlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ static void TLan_SetMulticastList( struct net_device *dev )
*
**************************************************************/

u32 TLan_HandleInvalid( struct net_device *dev, u16 host_int )
static u32 TLan_HandleInvalid( struct net_device *dev, u16 host_int )
{
/* printk( "TLAN: Invalid interrupt on %s.\n", dev->name ); */
return 0;
Expand Down Expand Up @@ -1432,7 +1432,7 @@ u32 TLan_HandleInvalid( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
{
TLanPrivateInfo *priv = netdev_priv(dev);
int eoc = 0;
Expand Down Expand Up @@ -1518,7 +1518,7 @@ u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
static u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
{
TLan_ReadAndClearStats( dev, TLAN_RECORD );

Expand Down Expand Up @@ -1554,7 +1554,7 @@ u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
static u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u32 ack = 0;
Expand Down Expand Up @@ -1689,7 +1689,7 @@ u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
static u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
{
printk( "TLAN: Test interrupt on %s.\n", dev->name );
return 1;
Expand Down Expand Up @@ -1719,7 +1719,7 @@ u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
static u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
{
TLanPrivateInfo *priv = netdev_priv(dev);
TLanList *head_list;
Expand Down Expand Up @@ -1767,7 +1767,7 @@ u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u32 ack;
Expand Down Expand Up @@ -1842,7 +1842,7 @@ u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
*
**************************************************************/

u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
static u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
{
TLanPrivateInfo *priv = netdev_priv(dev);
dma_addr_t head_list_phys;
Expand Down Expand Up @@ -1902,7 +1902,7 @@ u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
*
**************************************************************/

void TLan_Timer( unsigned long data )
static void TLan_Timer( unsigned long data )
{
struct net_device *dev = (struct net_device *) data;
TLanPrivateInfo *priv = netdev_priv(dev);
Expand Down Expand Up @@ -1983,7 +1983,7 @@ void TLan_Timer( unsigned long data )
*
**************************************************************/

void TLan_ResetLists( struct net_device *dev )
static void TLan_ResetLists( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
int i;
Expand Down Expand Up @@ -2043,7 +2043,7 @@ void TLan_ResetLists( struct net_device *dev )
} /* TLan_ResetLists */


void TLan_FreeLists( struct net_device *dev )
static void TLan_FreeLists( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
int i;
Expand Down Expand Up @@ -2092,7 +2092,7 @@ void TLan_FreeLists( struct net_device *dev )
*
**************************************************************/

void TLan_PrintDio( u16 io_base )
static void TLan_PrintDio( u16 io_base )
{
u32 data0, data1;
int i;
Expand Down Expand Up @@ -2127,7 +2127,7 @@ void TLan_PrintDio( u16 io_base )
*
**************************************************************/

void TLan_PrintList( TLanList *list, char *type, int num)
static void TLan_PrintList( TLanList *list, char *type, int num)
{
int i;

Expand Down Expand Up @@ -2163,7 +2163,7 @@ void TLan_PrintList( TLanList *list, char *type, int num)
*
**************************************************************/

void TLan_ReadAndClearStats( struct net_device *dev, int record )
static void TLan_ReadAndClearStats( struct net_device *dev, int record )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u32 tx_good, tx_under;
Expand Down Expand Up @@ -2238,7 +2238,7 @@ void TLan_ReadAndClearStats( struct net_device *dev, int record )
*
**************************************************************/

void
static void
TLan_ResetAdapter( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
Expand Down Expand Up @@ -2324,7 +2324,7 @@ TLan_ResetAdapter( struct net_device *dev )



void
static void
TLan_FinishReset( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
Expand Down Expand Up @@ -2448,7 +2448,7 @@ TLan_FinishReset( struct net_device *dev )
*
**************************************************************/

void TLan_SetMac( struct net_device *dev, int areg, char *mac )
static void TLan_SetMac( struct net_device *dev, int areg, char *mac )
{
int i;

Expand Down Expand Up @@ -2490,7 +2490,7 @@ void TLan_SetMac( struct net_device *dev, int areg, char *mac )
*
********************************************************************/

void TLan_PhyPrint( struct net_device *dev )
static void TLan_PhyPrint( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 i, data0, data1, data2, data3, phy;
Expand Down Expand Up @@ -2539,7 +2539,7 @@ void TLan_PhyPrint( struct net_device *dev )
*
********************************************************************/

void TLan_PhyDetect( struct net_device *dev )
static void TLan_PhyDetect( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 control;
Expand Down Expand Up @@ -2586,7 +2586,7 @@ void TLan_PhyDetect( struct net_device *dev )



void TLan_PhyPowerDown( struct net_device *dev )
static void TLan_PhyPowerDown( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 value;
Expand All @@ -2611,7 +2611,7 @@ void TLan_PhyPowerDown( struct net_device *dev )



void TLan_PhyPowerUp( struct net_device *dev )
static void TLan_PhyPowerUp( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 value;
Expand All @@ -2632,7 +2632,7 @@ void TLan_PhyPowerUp( struct net_device *dev )



void TLan_PhyReset( struct net_device *dev )
static void TLan_PhyReset( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 phy;
Expand Down Expand Up @@ -2660,7 +2660,7 @@ void TLan_PhyReset( struct net_device *dev )



void TLan_PhyStartLink( struct net_device *dev )
static void TLan_PhyStartLink( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 ability;
Expand Down Expand Up @@ -2747,7 +2747,7 @@ void TLan_PhyStartLink( struct net_device *dev )



void TLan_PhyFinishAutoNeg( struct net_device *dev )
static void TLan_PhyFinishAutoNeg( struct net_device *dev )
{
TLanPrivateInfo *priv = netdev_priv(dev);
u16 an_adv;
Expand Down Expand Up @@ -2903,7 +2903,7 @@ void TLan_PhyMonitor( struct net_device *dev )
*
**************************************************************/

int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
static int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
{
u8 nack;
u16 sio, tmp;
Expand Down Expand Up @@ -2993,7 +2993,7 @@ int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
*
**************************************************************/

void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
static void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
{
u16 sio;
u32 i;
Expand Down Expand Up @@ -3035,7 +3035,7 @@ void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
*
**************************************************************/

void TLan_MiiSync( u16 base_port )
static void TLan_MiiSync( u16 base_port )
{
int i;
u16 sio;
Expand Down Expand Up @@ -3074,7 +3074,7 @@ void TLan_MiiSync( u16 base_port )
*
**************************************************************/

void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
{
u16 sio;
int minten;
Expand Down Expand Up @@ -3144,7 +3144,7 @@ void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
*
**************************************************************/

void TLan_EeSendStart( u16 io_base )
static void TLan_EeSendStart( u16 io_base )
{
u16 sio;

Expand Down Expand Up @@ -3184,7 +3184,7 @@ void TLan_EeSendStart( u16 io_base )
*
**************************************************************/

int TLan_EeSendByte( u16 io_base, u8 data, int stop )
static int TLan_EeSendByte( u16 io_base, u8 data, int stop )
{
int err;
u8 place;
Expand Down Expand Up @@ -3245,7 +3245,7 @@ int TLan_EeSendByte( u16 io_base, u8 data, int stop )
*
**************************************************************/

void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
static void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
{
u8 place;
u16 sio;
Expand Down Expand Up @@ -3303,7 +3303,7 @@ void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
*
**************************************************************/

int TLan_EeReadByte( struct net_device *dev, u8 ee_addr, u8 *data )
static int TLan_EeReadByte( struct net_device *dev, u8 ee_addr, u8 *data )
{
int err;
TLanPrivateInfo *priv = netdev_priv(dev);
Expand Down

0 comments on commit 2de6aa5

Please sign in to comment.