staging: wilc1000: remove WILC_Sint32

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

drivers/staging/wilc1000/coreconfigsimulator.h

@@ -13,8 +13,8 @@
 #define CORECONFIGSIMULATOR_H
 
 
-extern WILC_Sint32 CoreConfigSimulatorInit (void);
-extern WILC_Sint32 CoreConfigSimulatorDeInit (void);
+extern s32 CoreConfigSimulatorInit (void);
+extern s32 CoreConfigSimulatorDeInit (void);
 
 
 #endif
\ No newline at end of file

drivers/staging/wilc1000/coreconfigurator.h

@@ -396,7 +396,7 @@ typedef enum {
 typedef struct {
 	u16 u16WIDid;
 	tenuWIDtype enuWIDtype;
-	WILC_Sint32 s32ValueSize;
+	s32 s32ValueSize;
 	s8      *ps8WidVal;
 
 } tstrWID;
@@ -472,25 +472,25 @@ typedef struct wid_site_survey_reslts {
 } wid_site_survey_reslts_s;
 #endif
 
-extern WILC_Sint32 CoreConfiguratorInit(void);
-extern WILC_Sint32 CoreConfiguratorDeInit(void);
+extern s32 CoreConfiguratorInit(void);
+extern s32 CoreConfiguratorDeInit(void);
 
-extern WILC_Sint32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
+extern s32 SendConfigPkt(u8 u8Mode, tstrWID *pstrWIDs,
 				 u32 u32WIDsCount, WILC_Bool bRespRequired, u32 drvHandler);
-extern WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
-extern WILC_Sint32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
+extern s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo);
+extern s32 DeallocateNetworkInfo(tstrNetworkInfo *pstrNetworkInfo);
 
-extern WILC_Sint32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
+extern s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen,
 				      tstrConnectRespInfo **ppstrConnectRespInfo);
-extern WILC_Sint32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);
+extern s32 DeallocateAssocRespInfo(tstrConnectRespInfo *pstrConnectRespInfo);
 
 #ifndef CONNECT_DIRECT
-extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
+extern s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
 				      wid_site_survey_reslts_s **ppstrSurveyResults, u32 *pu32SurveyResultsCount);
-extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);
+extern s32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);
 #endif
 
-extern WILC_Sint32 SendRawPacket(s8 *pspacket, WILC_Sint32 s32PacketLen);
+extern s32 SendRawPacket(s8 *pspacket, s32 s32PacketLen);
 extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);
 void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);
 void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);

drivers/staging/wilc1000/linux_wlan.c

@@ -2379,7 +2379,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
 	u32 size = 0, length = 0;
 	perInterface_wlan_t *nic;
 	struct WILC_WFI_priv *priv;
-	WILC_Sint32 s32Error = WILC_SUCCESS;
+	s32 s32Error = WILC_SUCCESS;
 
 
 

drivers/staging/wilc1000/wilc_errorsupport.h

@@ -37,7 +37,7 @@
 
 
 /* Error type */
-typedef WILC_Sint32 WILC_ErrNo;
+typedef s32 WILC_ErrNo;
 
 #define WILC_IS_ERR(__status__) (__status__ < WILC_SUCCESS)
 

drivers/staging/wilc1000/wilc_oswrapper.h

@@ -14,7 +14,6 @@
 #define WILC_OSW_INTERFACE_VER 2
 
 /* Integer Types */
-typedef signed int WILC_Sint32;
 typedef signed long long WILC_Sint64;
 
 /* Boolean type */

drivers/staging/wilc1000/wilc_strutils.c

@@ -9,7 +9,7 @@
  *  @date	18 Aug 2010
  *  @version	1.0
  */
-WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count)
+s32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count)
 {
 	return memcmp(pvArg1, pvArg2, u32Count);
 }
@@ -46,10 +46,10 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
 	return strncpy(pcTarget, pcSource, u32Count);
 }
 
-WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
+s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
 			 u32 u32Count)
 {
-	WILC_Sint32 s32Result;
+	s32 s32Result;
 
 	if (pcStr1 == NULL && pcStr2 == NULL)	{
 		s32Result = 0;

drivers/staging/wilc1000/wilc_strutils.h

@@ -22,7 +22,7 @@
  *  @date	18 Aug 2010
  *  @version	1.0
  */
-WILC_Sint32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count);
+s32 WILC_memcmp(const void *pvArg1, const void *pvArg2, u32 u32Count);
 
 /*!
  *  @brief	Internal implementation for memory copy
@@ -113,7 +113,7 @@ WILC_Char *WILC_strncpy(WILC_Char *pcTarget, const WILC_Char *pcSource,
  *  @date	7 Dec 2010
  *  @version	1.0
  */
-WILC_Sint32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
+s32 WILC_strncmp(const WILC_Char *pcStr1, const WILC_Char *pcStr2,
 			 u32 u32Count);
 
 /*!