Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8971280fb21354b118956bed506f79a515759410

Authored by Pekka Enberg
Committed by Greg Kroah-Hartman
1 parent 350e858868
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 5 changed files with 0 additions and 18 deletions Side-by-side Diff

drivers/staging/winbond/adapter.h
Diff comments   View file @ 8971280
1   -#define OS_LINK_STATUS (adapter->LinkStatus == OS_CONNECTED)
2 1 #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1
3 2 #define OS_SET_RESUME( _A ) _A->shutdown=0
4   -#define OS_CONNECT_STATUS_INDICATE( _A, _F ) WBLINUX_ConnectStatus( _A, _F )
5   -#define OS_DISCONNECTED 0
6   -#define OS_CONNECTED 1
7 3 #define OS_STOP( _A ) WBLINUX_stop( _A )
8 4  
9 5 #define OS_CURRENT_RX_BYTE( _A ) _A->RxByteCount
... ... @@ -36,8 +32,6 @@
36 32 u32 shutdown;
37 33  
38 34 atomic_t ThreadCount;
39   -
40   - u32 LinkStatus; // OS_DISCONNECTED or OS_CONNECTED
41 35  
42 36 u32 RxByteCount;
43 37 u32 TxByteCount;
drivers/staging/winbond/linux/common.h
Diff comments   View file @ 8971280
... ... @@ -44,10 +44,6 @@
44 44 #define WBDEBUG( _M ) 0
45 45 #endif
46 46  
47   -#define OS_DISCONNECTED 0
48   -#define OS_CONNECTED 1
49   -
50   -
51 47 #define OS_EVENT_INDICATE( _A, _B, _F )
52 48 #define OS_PMKID_STATUS_EVENT( _A )
53 49  
drivers/staging/winbond/mds_s.h
Diff comments   View file @ 8971280
... ... @@ -25,7 +25,6 @@
25 25 #define CURRENT_CONTROL_PORT_BLOCK ( psSME->wpa_ok!=1 || (adapter->Mds.boCounterMeasureBlock==1 && (CURRENT_ENCRYPT_STATUS==ENCRYPT_TKIP)) )
26 26 #define CURRENT_FRAGMENT_THRESHOLD (adapter->Mds.TxFragmentThreshold & ~0x1)
27 27 #define CURRENT_PREAMBLE_MODE psLOCAL->boShortPreamble?WLAN_PREAMBLE_TYPE_SHORT:WLAN_PREAMBLE_TYPE_LONG
28   -#define CURRENT_LINK_ON OS_LINK_STATUS
29 28 #define CURRENT_TX_RATE adapter->sLocalPara.CurrentTxRate
30 29 #define CURRENT_FALL_BACK_TX_RATE adapter->sLocalPara.CurrentTxFallbackRate
31 30 #define CURRENT_TX_RATE_FOR_MNG adapter->sLocalPara.CurrentTxRateForMng
drivers/staging/winbond/wblinux.c
Diff comments   View file @ 8971280
... ... @@ -224,9 +224,4 @@
224 224  
225 225 return false;
226 226 }
227   -
228   -void WBLINUX_ConnectStatus(struct wb35_adapter * adapter, u32 flag)
229   -{
230   - adapter->LinkStatus = flag; // OS_DISCONNECTED or OS_CONNECTED
231   -}
drivers/staging/winbond/wblinux_f.h
Diff comments   View file @ 8971280
... ... @@ -14,6 +14,5 @@
14 14 struct net_device_stats * wb35_netdev_stats( struct net_device *netdev );
15 15 void WBLINUX_stop( struct wb35_adapter *adapter );
16 16 void WbWlanHalt( struct wb35_adapter *adapter );
17   -void WBLINUX_ConnectStatus( struct wb35_adapter *adapter, u32 flag );
18 17 unsigned char WbWLanInitialize(struct wb35_adapter *adapter);