Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8971280f authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: remove unused link status code 



The WBLINUX_ConnectStatus() and related code is not used anywhere so remove
them from the driver.

Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 350e8588

drivers/staging/winbond/adapter.h

+0 −6
Original line number Diff line number Diff line 
#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
@@ -37,8 +33,6 @@ struct wb35_adapter { 


	atomic_t ThreadCount;



	u32 LinkStatus;		// OS_DISCONNECTED or OS_CONNECTED



	u32 RxByteCount;

	u32 TxByteCount;

drivers/staging/winbond/linux/common.h

+0 −4
Original line number Diff line number Diff line
@@ -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 )

drivers/staging/winbond/mds_s.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/winbond/wblinux.c

+0 −6
Original line number Diff line number Diff line
@@ -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

}

drivers/staging/winbond/wblinux_f.h

+0 −1
Original line number Diff line number Diff line
@@ -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);