staging: wilc1000: remove WILC_Uint16

Use u16 instead of WILC_Uint16.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/wilc1000/coreconfigurator.h

@@ -31,7 +31,7 @@
 #define NUM_11N_HUT_SWITCHES    0
 #endif /* MAC_802_11N */
 
-extern WILC_Uint16 g_num_total_switches;
+extern u16 g_num_total_switches;
 
 #define MAC_HDR_LEN             24          /* No Address4 - non-ESS         */
 #define MAX_SSID_LEN            33
@@ -65,7 +65,7 @@ extern WILC_Uint16 g_num_total_switches;
 /*****************************************************************************/
 /* Function Macros                                                           */
 /*****************************************************************************/
-#define MAKE_WORD16(lsb, msb) ((((WILC_Uint16)(msb) << 8) & 0xFF00) | (lsb))
+#define MAKE_WORD16(lsb, msb) ((((u16)(msb) << 8) & 0xFF00) | (lsb))
 #define MAKE_WORD32(lsw, msw) ((((WILC_Uint32)(msw) << 16) & 0xFFFF0000) | (lsw))
 
 
@@ -394,7 +394,7 @@ typedef enum {
 } tenuConnectSts;
 
 typedef struct {
-	WILC_Uint16 u16WIDid;
+	u16 u16WIDid;
 	tenuWIDtype enuWIDtype;
 	WILC_Sint32 s32ValueSize;
 	WILC_Sint8      *ps8WidVal;
@@ -409,11 +409,11 @@ typedef struct {
 /* This structure is used to support parsing of the received 'N' message */
 typedef struct {
 	WILC_Sint8 s8rssi;
-	WILC_Uint16 u16CapInfo;
+	u16 u16CapInfo;
 	u8 au8ssid[MAX_SSID_LEN];
 	u8 u8SsidLen;
 	u8 au8bssid[6];
-	WILC_Uint16 u16BeaconPeriod;
+	u16 u16BeaconPeriod;
 	u8 u8DtimPeriod;
 	u8 u8channel;
 	unsigned long u32TimeRcvdInScanCached; /* of type unsigned long to be accepted by the linux kernel macro time_after() */
@@ -426,7 +426,7 @@ typedef struct {
 	WILC_Uint32 u32Tsf; /* time-stamp [Low only 32 bit] */
 #endif
 	u8 *pu8IEs;
-	WILC_Uint16 u16IEsLen;
+	u16 u16IEsLen;
 	void *pJoinParams;
 	tstrRSSI strRssi;
 	WILC_Uint64 u64Tsf; /* time-stamp [Low and High 64 bit] */
@@ -434,11 +434,11 @@ typedef struct {
 
 /* This structure is used to support parsing of the received Association Response frame */
 typedef struct {
-	WILC_Uint16 u16capability;
-	WILC_Uint16 u16ConnectStatus;
-	WILC_Uint16 u16AssocID;
+	u16 u16capability;
+	u16 u16ConnectStatus;
+	u16 u16AssocID;
 	u8 *pu8RespIEs;
-	WILC_Uint16 u16RespIEsLen;
+	u16 u16RespIEsLen;
 } tstrConnectRespInfo;
 
 
@@ -447,14 +447,14 @@ typedef struct {
 	u8 *pu8ReqIEs;
 	size_t ReqIEsLen;
 	u8 *pu8RespIEs;
-	WILC_Uint16 u16RespIEsLen;
-	WILC_Uint16 u16ConnectStatus;
+	u16 u16RespIEsLen;
+	u16 u16ConnectStatus;
 } tstrConnectInfo;
 
 
 
 typedef struct {
-	WILC_Uint16 u16reason;
+	u16 u16reason;
 	u8 *ie;
 	size_t ie_len;
 } tstrDisconnectNotifInfo;

drivers/staging/wilc1000/host_interface.h

@@ -126,7 +126,7 @@ typedef enum {WID_CHAR  = 0,
 	      WID_UNDEF = 7} WID_TYPE_T;
 #endif
 typedef struct {
-	WILC_Uint16 cfg_wid;
+	u16 cfg_wid;
 	WID_TYPE_T cfg_type;
 	WILC_Sint8     *pu8Para;
 } cfg_param_t;
@@ -193,22 +193,22 @@ typedef struct {
 	u8 ht_enable;
 	u8 bss_type;
 	u8 auth_type;
-	WILC_Uint16 auth_timeout;
+	u16 auth_timeout;
 	u8 power_mgmt_mode;
-	WILC_Uint16 short_retry_limit;
-	WILC_Uint16 long_retry_limit;
-	WILC_Uint16 frag_threshold;
-	WILC_Uint16 rts_threshold;
-	WILC_Uint16 preamble_type;
+	u16 short_retry_limit;
+	u16 long_retry_limit;
+	u16 frag_threshold;
+	u16 rts_threshold;
+	u16 preamble_type;
 	u8 short_slot_allowed;
 	u8 txop_prot_disabled;
-	WILC_Uint16 beacon_interval;
-	WILC_Uint16 dtim_period;
+	u16 beacon_interval;
+	u16 dtim_period;
 	SITE_SURVEY_T site_survey_enabled;
-	WILC_Uint16 site_survey_scan_time;
+	u16 site_survey_scan_time;
 	u8 scan_source;
-	WILC_Uint16 active_scan_time;
-	WILC_Uint16 passive_scan_time;
+	u16 active_scan_time;
+	u16 passive_scan_time;
 	CURRENT_TX_RATE_T curr_tx_rate;
 
 } tstrCfgParamVal;
@@ -357,13 +357,13 @@ typedef struct {
 typedef struct {
 	u8 au8Bssid[ETH_ALEN];
 	u8 u8Ted;
-	WILC_Uint16 u16BufferSize;
-	WILC_Uint16 u16SessionTimeout;
+	u16 u16BufferSize;
+	u16 u16SessionTimeout;
 } tstrHostIfBASessionInfo;
 
 #ifdef WILC_P2P
 typedef struct {
-	WILC_Uint16 u16Channel;
+	u16 u16Channel;
 	WILC_Uint32 u32duration;
 	tWILCpfRemainOnChanExpired pRemainOnChanExpired;
 	tWILCpfRemainOnChanReady pRemainOnChanReady;
@@ -374,7 +374,7 @@ typedef struct {
 typedef struct {
 
 	WILC_Bool bReg;
-	WILC_Uint16 u16FrameType;
+	u16 u16FrameType;
 	u8 u8Regid;
 
 
@@ -462,21 +462,21 @@ typedef enum {
 
 typedef struct {
 	u8 au8BSSID[ETH_ALEN];
-	WILC_Uint16 u16AssocID;
+	u16 u16AssocID;
 	u8 u8NumRates;
 	const u8 *pu8Rates;
 	WILC_Bool bIsHTSupported;
-	WILC_Uint16 u16HTCapInfo;
+	u16 u16HTCapInfo;
 	u8 u8AmpduParams;
 	u8 au8SuppMCsSet[16];
-	WILC_Uint16 u16HTExtParams;
+	u16 u16HTExtParams;
 	WILC_Uint32 u32TxBeamformingCap;
 	u8 u8ASELCap;
-	WILC_Uint16 u16FlagsMask;               /*<! Determines which of u16FlagsSet were changed>*/
-	WILC_Uint16 u16FlagsSet;                /*<! Decoded according to tenuWILC_StaFlag */
+	u16 u16FlagsMask;               /*<! Determines which of u16FlagsSet were changed>*/
+	u16 u16FlagsSet;                /*<! Decoded according to tenuWILC_StaFlag */
 } tstrWILC_AddStaParam;
 
-/* extern void CfgDisconnected(void* pUserVoid, WILC_Uint16 u16reason, u8 * ie, size_t ie_len); */
+/* extern void CfgDisconnected(void* pUserVoid, u16 u16reason, u8 * ie, size_t ie_len); */
 
 /*****************************************************************************/
 /*																			 */
@@ -869,7 +869,7 @@ WILC_Sint32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv);
  *  @date		8 March 2012
  *  @version		1.0
  */
-WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16ReasonCode);
+WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, u16 u16ReasonCode);
 
 /**
  *  @brief              disconnects a sta
@@ -1038,7 +1038,7 @@ WILC_Sint32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParam
  *  @date		8 March 2012
  *  @version		1.0
  */
-WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16WID, WILC_Uint16 *pu16WID_Value);
+WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, u16 u16WID, u16 *pu16WID_Value);
 /*****************************************************************************/
 /*							Notification Functions							 */
 /*****************************************************************************/
@@ -1058,7 +1058,7 @@ WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16WID, WILC_Uint
  *  @version		1.0
  */
 void host_int_send_join_leave_info_to_host
-	(WILC_Uint16 assocId, u8 *stationAddr, WILC_Bool joining);
+	(u16 assocId, u8 *stationAddr, WILC_Bool joining);
 
 /**
  *  @brief              notifies host with stations found in scan
@@ -1074,7 +1074,7 @@ void host_int_send_join_leave_info_to_host
  *  @version		1.0
  */
 void host_int_send_network_info_to_host
-	(u8 *macStartAddress, WILC_Uint16 u16RxFrameLen, WILC_Sint8 s8Rssi);
+	(u8 *macStartAddress, u16 u16RxFrameLen, WILC_Sint8 s8Rssi);
 
 /**
  *  @brief              host interface initialization function
@@ -1285,7 +1285,7 @@ WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8IPAddr, u8
  *  @date
  *  @version	1.0
  */
-WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32SessionID, WILC_Uint32 u32duration, WILC_Uint16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg);
+WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32SessionID, WILC_Uint32 u32duration, u16 chan, tWILCpfRemainOnChanExpired RemainOnChanExpired, tWILCpfRemainOnChanReady RemainOnChanReady, void *pvUserArg);
 
 /**
  *  @brief              host_int_ListenStateExpired
@@ -1312,7 +1312,7 @@ WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u
  *  @date
  *  @version	1.0
  */
-WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16FrameType, WILC_Bool bReg);
+WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, u16 u16FrameType, WILC_Bool bReg);
 #endif
 /**
  *  @brief           host_int_set_wfi_drv_handler

drivers/staging/wilc1000/linux_mon.c

@@ -421,7 +421,7 @@ void WILC_mgm_HOSTAPD_ACK(void *priv, WILC_Bool bStatus)
 	u8 *buf =  pv_data->buff;
 
 	/* len of the original frame without the added pointer at the tail */
-	WILC_Uint16 u16len = (pv_data->size) - sizeof(struct tx_complete_mon_data *);
+	u16 u16len = (pv_data->size) - sizeof(struct tx_complete_mon_data *);
 
 
 	/*if(bStatus == 1){

drivers/staging/wilc1000/linux_wlan.c

@@ -67,7 +67,7 @@ unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xb2};
 #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 extern WILC_Bool g_obtainingIP;
 #endif
-extern WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue);
+extern u16 Set_machw_change_vir_if(WILC_Bool bValue);
 extern void resolve_disconnect_aberration(void *drvHandler);
 extern u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 void wilc1000_wlan_deinit(linux_wlan_t *nic);

drivers/staging/wilc1000/wilc_oswrapper.h

@@ -14,7 +14,6 @@
 #define WILC_OSW_INTERFACE_VER 2
 
 /* Integer Types */
-typedef unsigned short WILC_Uint16;
 typedef unsigned int WILC_Uint32;
 typedef unsigned long long WILC_Uint64;
 typedef signed char WILC_Sint8;

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

@@ -25,7 +25,7 @@
 extern void linux_wlan_free(void *vp);
 extern int linux_wlan_get_firmware(perInterface_wlan_t *p_nic);
 extern void linux_wlan_unlock(void *vp);
-extern WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue);
+extern u16 Set_machw_change_vir_if(WILC_Bool bValue);
 
 extern int mac_open(struct net_device *ndev);
 extern int mac_close(struct net_device *ndev);
@@ -574,7 +574,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
 
 	if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
 		/*Initialization*/
-		WILC_Uint16 u16ConnectStatus = WLAN_STATUS_SUCCESS;
+		u16 u16ConnectStatus = WLAN_STATUS_SUCCESS;
 
 		u16ConnectStatus = pstrConnectInfo->u16ConnectStatus;
 
@@ -2549,7 +2549,7 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy,
 			/*Save the current channel after we tune to it*/
 			u8CurrChannel = chan->hw_value;
 		} else if (ieee80211_is_action(mgmt->frame_control))   {
-			PRINT_D(GENERIC_DBG, "ACTION FRAME:%x\n", (WILC_Uint16)mgmt->frame_control);
+			PRINT_D(GENERIC_DBG, "ACTION FRAME:%x\n", (u16)mgmt->frame_control);
 
 
 			/*BugID_4847*/
@@ -2845,7 +2845,7 @@ static int WILC_WFI_change_virt_intf(struct wiphy *wiphy, struct net_device *dev
 	struct WILC_WFI_priv *priv;
 	perInterface_wlan_t *nic;
 	u8 interface_type;
-	WILC_Uint16 TID = 0;
+	u16 TID = 0;
 	#ifdef WILC_P2P
 	u8 i;
 	#endif

drivers/staging/wilc1000/wilc_wfi_netdevice.h

@@ -175,7 +175,7 @@ struct WILC_WFI_priv {
 };
 
 typedef struct {
-	WILC_Uint16 frame_type;
+	u16 frame_type;
 	WILC_Bool reg;
 
 } struct_frame_reg;

drivers/staging/wilc1000/wilc_wlan.c

@@ -27,7 +27,7 @@ extern void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size);
 extern void frmw_to_linux(uint8_t *buff, uint32_t size);
 int sdio_xfer_cnt(void);
 uint32_t wilc_get_chipid(uint8_t update);
-WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue);
+u16 Set_machw_change_vir_if(WILC_Bool bValue);
 
 
 
@@ -2325,9 +2325,9 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
 }
 
 #define BIT31 (1 << 31)
-WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue)
+u16 Set_machw_change_vir_if(WILC_Bool bValue)
 {
-	WILC_Uint16 ret;
+	u16 ret;
 	WILC_Uint32 reg;
 
 	/*Reset WILC_CHANGING_VIR_IF register to allow adding futrue keys to CE H/W*/
@@ -2354,7 +2354,7 @@ WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue)
 }
 
 #ifdef WILC_FULLY_HOSTING_AP
-wilc_wlan_dev_t *Get_wlan_context(WILC_Uint16 *pu16size)
+wilc_wlan_dev_t *Get_wlan_context(u16 *pu16size)
 {
 	*pu16size = sizeof(wilc_wlan_dev_t);
 	return &g_wlan;