Skip to content

Commit

Permalink
Staging: w35und: remove unused link status code
Browse files Browse the repository at this point in the history
The WBLINUX_ConnectStatus() and related code is not used anywhere so remove
them from the driver.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 350e858 commit 8971280
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 18 deletions.
6 changes: 0 additions & 6 deletions drivers/staging/winbond/adapter.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#define OS_LINK_STATUS (adapter->LinkStatus == OS_CONNECTED)
#define OS_SET_SHUTDOWN( _A ) _A->shutdown=1
#define OS_SET_RESUME( _A ) _A->shutdown=0
#define OS_CONNECT_STATUS_INDICATE( _A, _F ) WBLINUX_ConnectStatus( _A, _F )
#define OS_DISCONNECTED 0
#define OS_CONNECTED 1
#define OS_STOP( _A ) WBLINUX_stop( _A )

#define OS_CURRENT_RX_BYTE( _A ) _A->RxByteCount
Expand Down Expand Up @@ -37,8 +33,6 @@ struct wb35_adapter {

atomic_t ThreadCount;

u32 LinkStatus; // OS_DISCONNECTED or OS_CONNECTED

u32 RxByteCount;
u32 TxByteCount;

Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/winbond/linux/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
#define WBDEBUG( _M ) 0
#endif

#define OS_DISCONNECTED 0
#define OS_CONNECTED 1


#define OS_EVENT_INDICATE( _A, _B, _F )
#define OS_PMKID_STATUS_EVENT( _A )

Expand Down
1 change: 0 additions & 1 deletion drivers/staging/winbond/mds_s.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#define CURRENT_CONTROL_PORT_BLOCK ( psSME->wpa_ok!=1 || (adapter->Mds.boCounterMeasureBlock==1 && (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) )
#define CURRENT_FRAGMENT_THRESHOLD (adapter->Mds.TxFragmentThreshold & ~0x1)
#define CURRENT_PREAMBLE_MODE psLOCAL->boShortPreamble?WLAN_PREAMBLE_TYPE_SHORT:WLAN_PREAMBLE_TYPE_LONG
#define CURRENT_LINK_ON OS_LINK_STATUS
#define CURRENT_TX_RATE adapter->sLocalPara.CurrentTxRate
#define CURRENT_FALL_BACK_TX_RATE adapter->sLocalPara.CurrentTxFallbackRate
#define CURRENT_TX_RATE_FOR_MNG adapter->sLocalPara.CurrentTxRateForMng
Expand Down
6 changes: 0 additions & 6 deletions drivers/staging/winbond/wblinux.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,3 @@ WbWLanInitialize(struct wb35_adapter *adapter)

return false;
}

void WBLINUX_ConnectStatus(struct wb35_adapter * adapter, u32 flag)
{
adapter->LinkStatus = flag; // OS_DISCONNECTED or OS_CONNECTED
}

1 change: 0 additions & 1 deletion drivers/staging/winbond/wblinux_f.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ void wb35_set_multicast( struct net_device *netdev );
struct net_device_stats * wb35_netdev_stats( struct net_device *netdev );
void WBLINUX_stop( struct wb35_adapter *adapter );
void WbWlanHalt( struct wb35_adapter *adapter );
void WBLINUX_ConnectStatus( struct wb35_adapter *adapter, u32 flag );
unsigned char WbWLanInitialize(struct wb35_adapter *adapter);

0 comments on commit 8971280

Please sign in to comment.