staging: wilc1000: remove WILC_Uint8

Just use u8, as that's what you really want in a kernel driver.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/wilc1000/coreconfigurator.h

@@ -402,30 +402,30 @@ typedef struct {
 } tstrWID;
 
 typedef struct {
-	WILC_Uint8 u8Full;
-	WILC_Uint8 u8Index;
+	u8 u8Full;
+	u8 u8Index;
 	WILC_Sint8 as8RSSI[NUM_RSSI];
 } tstrRSSI;
 /* This structure is used to support parsing of the received 'N' message */
 typedef struct {
 	WILC_Sint8 s8rssi;
 	WILC_Uint16 u16CapInfo;
-	WILC_Uint8 au8ssid[MAX_SSID_LEN];
-	WILC_Uint8 u8SsidLen;
-	WILC_Uint8 au8bssid[6];
+	u8 au8ssid[MAX_SSID_LEN];
+	u8 u8SsidLen;
+	u8 au8bssid[6];
 	WILC_Uint16 u16BeaconPeriod;
-	WILC_Uint8 u8DtimPeriod;
-	WILC_Uint8 u8channel;
+	u8 u8DtimPeriod;
+	u8 u8channel;
 	unsigned long u32TimeRcvdInScanCached; /* of type unsigned long to be accepted by the linux kernel macro time_after() */
 	unsigned long u32TimeRcvdInScan;
 	WILC_Bool bNewNetwork;
 #ifdef AGING_ALG
-	WILC_Uint8 u8Found;
+	u8 u8Found;
 #endif
 #ifdef WILC_P2P
 	WILC_Uint32 u32Tsf; /* time-stamp [Low only 32 bit] */
 #endif
-	WILC_Uint8 *pu8IEs;
+	u8 *pu8IEs;
 	WILC_Uint16 u16IEsLen;
 	void *pJoinParams;
 	tstrRSSI strRssi;
@@ -437,16 +437,16 @@ typedef struct {
 	WILC_Uint16 u16capability;
 	WILC_Uint16 u16ConnectStatus;
 	WILC_Uint16 u16AssocID;
-	WILC_Uint8 *pu8RespIEs;
+	u8 *pu8RespIEs;
 	WILC_Uint16 u16RespIEsLen;
 } tstrConnectRespInfo;
 
 
 typedef struct {
-	WILC_Uint8 au8bssid[6];
-	WILC_Uint8 *pu8ReqIEs;
+	u8 au8bssid[6];
+	u8 *pu8ReqIEs;
 	size_t ReqIEsLen;
-	WILC_Uint8 *pu8RespIEs;
+	u8 *pu8RespIEs;
 	WILC_Uint16 u16RespIEsLen;
 	WILC_Uint16 u16ConnectStatus;
 } tstrConnectInfo;
@@ -455,19 +455,19 @@ typedef struct {
 
 typedef struct {
 	WILC_Uint16 u16reason;
-	WILC_Uint8 *ie;
+	u8 *ie;
 	size_t ie_len;
 } tstrDisconnectNotifInfo;
 
 #ifndef CONNECT_DIRECT
 typedef struct wid_site_survey_reslts {
 	WILC_Char SSID[MAX_SSID_LEN];
-	WILC_Uint8 BssType;
-	WILC_Uint8 Channel;
-	WILC_Uint8 SecurityStatus;
-	WILC_Uint8 BSSID[6];
+	u8 BssType;
+	u8 Channel;
+	u8 SecurityStatus;
+	u8 BSSID[6];
 	WILC_Char RxPower;
-	WILC_Uint8 Reserved;
+	u8 Reserved;
 
 } wid_site_survey_reslts_s;
 #endif
@@ -475,24 +475,24 @@ typedef struct wid_site_survey_reslts {
 extern WILC_Sint32 CoreConfiguratorInit(void);
 extern WILC_Sint32 CoreConfiguratorDeInit(void);
 
-extern WILC_Sint32 SendConfigPkt(WILC_Uint8 u8Mode, tstrWID *pstrWIDs,
+extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
 				 WILC_Uint32 u32WIDsCount, WILC_Bool bRespRequired, WILC_Uint32 drvHandler);
-extern WILC_Sint32 ParseNetworkInfo(WILC_Uint8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
+extern WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
 extern WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
 
-extern WILC_Sint32 ParseAssocRespInfo(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BufferLen,
+extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, WILC_Uint32 u32BufferLen,
 				      tstrConnectRespInfo **ppstrConnectRespInfo);
 extern WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);
 
 #ifndef CONNECT_DIRECT
-extern WILC_Sint32 ParseSurveyResults(WILC_Uint8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
+extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
 				      wid_site_survey_reslts_s **ppstrSurveyResults, WILC_Uint32 *pu32SurveyResultsCount);
 extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);
 #endif
 
 extern WILC_Sint32 SendRawPacket(WILC_Sint8 *pspacket, WILC_Sint32 s32PacketLen);
-extern void NetworkInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length);
-void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length);
-void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length);
+extern void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
+void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
+void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length);
 
 #endif

drivers/staging/wilc1000/fifo_buffer.c

@@ -45,7 +45,7 @@ WILC_Uint32 FIFO_DeInit(tHANDLE hFifo)
 	return u32Error;
 }
 
-WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead)
+WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead)
 {
 	WILC_Uint32 u32Error = 0;
 	tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;
@@ -86,7 +86,7 @@ WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32
 	return u32Error;
 }
 
-WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer, WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite)
+WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer, WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite)
 {
 	WILC_Uint32 u32Error = 0;
 	tstrFifoHandler *pstrFifoHandler = (tstrFifoHandler *) hFifo;

drivers/staging/wilc1000/fifo_buffer.h

@@ -5,7 +5,7 @@
 #define tHANDLE	void *
 
 typedef struct {
-	WILC_Uint8		*pu8Buffer;
+	u8		*pu8Buffer;
 	WILC_Uint32 u32BufferLength;
 	WILC_Uint32 u32WriteOffset;
 	WILC_Uint32 u32ReadOffset;
@@ -17,7 +17,7 @@ typedef struct {
 extern WILC_Uint32 FIFO_InitBuffer(tHANDLE *hBuffer,
 								   WILC_Uint32 u32BufferLength);
 extern WILC_Uint32 FIFO_DeInit(tHANDLE hFifo);
-extern WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer,
+extern WILC_Uint32 FIFO_ReadBytes(tHANDLE hFifo, u8 *pu8Buffer,
 				WILC_Uint32 u32BytesToRead, WILC_Uint32 *pu32BytesRead);
-extern WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, WILC_Uint8 *pu8Buffer,
-				WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite);
+extern WILC_Uint32 FIFO_WriteBytes(tHANDLE hFifo, u8 *pu8Buffer,
+				WILC_Uint32 u32BytesToWrite, WILC_Bool bForceOverWrite);
\ No newline at end of file

drivers/staging/wilc1000/linux_mon.c

@@ -46,9 +46,9 @@ extern int  mac_xmit(struct sk_buff *skb, struct net_device *dev);
 #endif
 
 
-WILC_Uint8 srcAdd[6];
-WILC_Uint8 bssid[6];
-WILC_Uint8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+u8 srcAdd[6];
+u8 bssid[6];
+u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 /**
  *  @brief      WILC_WFI_monitor_rx
  *  @details
@@ -186,7 +186,7 @@ static void mgmt_tx_complete(void *priv, int status)
 	/* struct wilc_wfi_radiotap_cb_hdr *cb_hdr; */
 
 	struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv;
-	WILC_Uint8 *buf =  pv_data->buff;
+	u8 *buf =  pv_data->buff;
 
 
 
@@ -418,7 +418,7 @@ void WILC_mgm_HOSTAPD_ACK(void *priv, WILC_Bool bStatus)
 	struct wilc_wfi_radiotap_cb_hdr *cb_hdr;
 
 	struct tx_complete_mon_data *pv_data = (struct tx_complete_mon_data *)priv;
-	WILC_Uint8 *buf =  pv_data->buff;
+	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 *);
@@ -502,7 +502,7 @@ static void WILC_WFI_mon_setup(struct net_device *dev)
 		/* u8 * mac_add; */
 		unsigned char mac_add[] = {0x00, 0x50, 0xc2, 0x5e, 0x10, 0x8f};
 		/* priv = wiphy_priv(priv->dev->ieee80211_ptr->wiphy); */
-		/* mac_add = (WILC_Uint8*)WILC_MALLOC(ETH_ALEN); */
+		/* mac_add = (u8*)WILC_MALLOC(ETH_ALEN); */
 		/* status = host_int_get_MacAddress(priv->hWILCWFIDrv,mac_add); */
 		/* mac_add[ETH_ALEN-1]+=1; */
 		memcpy(dev->dev_addr, mac_add, ETH_ALEN);

drivers/staging/wilc1000/linux_wlan.c

@@ -69,7 +69,7 @@ extern WILC_Bool g_obtainingIP;
 #endif
 extern WILC_Uint16 Set_machw_change_vir_if(WILC_Bool bValue);
 extern void resolve_disconnect_aberration(void *drvHandler);
-extern WILC_Uint8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
+extern u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 void wilc1000_wlan_deinit(linux_wlan_t *nic);
 #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 extern WILC_TimerHandle hDuringIpTimer;
@@ -258,10 +258,10 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
 	struct WILC_WFI_priv *priv;
 	tstrWILC_WFIDrv *pstrWFIDrv;
 	struct net_device *dev;
-	WILC_Uint8 *pIP_Add_buff;
+	u8 *pIP_Add_buff;
 	WILC_Sint32 s32status = WILC_FAIL;
 	perInterface_wlan_t *nic;
-	WILC_Uint8 null_ip[4] = {0};
+	u8 null_ip[4] = {0};
 	char wlan_dev_name[5] = "wlan0";
 
 	if (dev_iface == NULL || dev_iface->ifa_dev == NULL || dev_iface->ifa_dev->dev == NULL)	{
@@ -2377,7 +2377,7 @@ int mac_close(struct net_device *ndev)
 int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 {
 
-	WILC_Uint8 *buff = NULL;
+	u8 *buff = NULL;
 	WILC_Sint8 rssi;
 	WILC_Uint32 size = 0, length = 0;
 	perInterface_wlan_t *nic;

drivers/staging/wilc1000/wilc_msgqueue.h

@@ -19,7 +19,7 @@
  */
 typedef struct {
 	/* a dummy member to avoid compiler errors*/
-	WILC_Uint8 dummy;
+	u8 dummy;
 
 } tstrWILC_MsgQueueAttrs;
 

drivers/staging/wilc1000/wilc_oswrapper.h

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

drivers/staging/wilc1000/wilc_strutils.c

@@ -30,7 +30,7 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C
  *  @date	18 Aug 2010
  *  @version	1.0
  */
-void *WILC_memset(void *pvTarget, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count)
+void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count)
 {
 	return memset(pvTarget, u8SetValue, u32Count);
 }

drivers/staging/wilc1000/wilc_strutils.h

@@ -53,11 +53,11 @@ void WILC_memcpy_INTERNAL(void *pvTarget, const void *pvSource, WILC_Uint32 u32C
 static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32 u32Count)
 {
 	if (
-		(((WILC_Uint8 *)pvTarget <= (WILC_Uint8 *)pvSource)
-		 && (((WILC_Uint8 *)pvTarget + u32Count) > (WILC_Uint8 *)pvSource))
+		(((u8 *)pvTarget <= (u8 *)pvSource)
+		 && (((u8 *)pvTarget + u32Count) > (u8 *)pvSource))
 
-		|| (((WILC_Uint8 *)pvSource <= (WILC_Uint8 *)pvTarget)
-		    && (((WILC_Uint8 *)pvSource + u32Count) > (WILC_Uint8 *)pvTarget))
+		|| (((u8 *)pvSource <= (u8 *)pvTarget)
+		    && (((u8 *)pvSource + u32Count) > (u8 *)pvTarget))
 		) {
 		/* ovelapped memory, return Error */
 		return WILC_FAIL;
@@ -78,7 +78,7 @@ static WILC_ErrNo WILC_memcpy(void *pvTarget, const void *pvSource, WILC_Uint32
  *  @date	18 Aug 2010
  *  @version	1.0
  */
-void *WILC_memset(void *pvTarget, WILC_Uint8 u8SetValue, WILC_Uint32 u32Count);
+void *WILC_memset(void *pvTarget, u8 u8SetValue, WILC_Uint32 u32Count);
 
 /*!
  *  @brief	copies the contents of source string into the target string

drivers/staging/wilc1000/wilc_timer.h

@@ -21,7 +21,7 @@ typedef void (*tpfWILC_TimerFunction)(void *);
  */
 typedef struct {
 	/* a dummy member to avoid compiler errors*/
-	WILC_Uint8 dummy;
+	u8 dummy;
 } tstrWILC_TimerAttrs;
 
 /*!

drivers/staging/wilc1000/wilc_wfi_netdevice.h

@@ -109,7 +109,7 @@ struct wilc_wfi_wep_key {
 };
 
 struct sta_info {
-	WILC_Uint8 au8Sta_AssociatedBss[MAX_NUM_STA][ETH_ALEN];
+	u8 au8Sta_AssociatedBss[MAX_NUM_STA][ETH_ALEN];
 };
 
 #ifdef WILC_P2P
@@ -139,10 +139,10 @@ struct WILC_WFI_priv {
 
 
 
-	WILC_Uint8 au8AssociatedBss[ETH_ALEN];
+	u8 au8AssociatedBss[ETH_ALEN];
 	struct sta_info assoc_stainfo;
 	struct net_device_stats stats;
-	WILC_Uint8 monitor_flag;
+	u8 monitor_flag;
 	int status;
 	struct WILC_WFI_packet *ppool;
 	struct WILC_WFI_packet *rx_queue; /* List of incoming packets */
@@ -157,13 +157,13 @@ struct WILC_WFI_priv {
 	WILC_WFIDrvHandle hWILCWFIDrv_2;
 	tstrHostIFpmkidAttr pmkid_list;
 	struct WILC_WFI_stats netstats;
-	WILC_Uint8 WILC_WFI_wep_default;
-	WILC_Uint8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
-	WILC_Uint8 WILC_WFI_wep_key_len[4];
+	u8 WILC_WFI_wep_default;
+	u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
+	u8 WILC_WFI_wep_key_len[4];
 	struct net_device *real_ndev;   /* The real interface that the monitor is on */
 	struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
 	struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA];
-	WILC_Uint8 wilc_groupkey;
+	u8 wilc_groupkey;
 	/* semaphores */
 	struct semaphore SemHandleUpdateStats;
 	struct semaphore hSemScanReq;
@@ -250,7 +250,7 @@ typedef struct {
 
 typedef struct {
 	uint8_t u8IfIdx;
-	WILC_Uint8 iftype;
+	u8 iftype;
 	int monitor_flag;
 	int mac_opened;
 	#ifdef WILC_P2P

drivers/staging/wilc1000/wilc_wlan.c

@@ -21,7 +21,7 @@ extern wilc_hif_func_t hif_sdio;
 extern wilc_hif_func_t hif_spi;
 extern wilc_cfg_func_t mac_cfg;
 #if defined(PLAT_RK3026_TCHIP)
-extern WILC_Uint8 g_wilc_initialized; /* AMR : 0422 RK3026 Crash issue */
+extern u8 g_wilc_initialized; /* AMR : 0422 RK3026 Crash issue */
 #endif
 extern void WILC_WFI_mgmt_rx(uint8_t *buff, uint32_t size);
 extern void frmw_to_linux(uint8_t *buff, uint32_t size);