staging: wilc1000: remove WILC_Uint64

Use u64 instead of WILC_Uint64.

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

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 2bb513dde065ce1316eb9686caf26302af9b6da7..0a030806844a103948a6d100d06df851a4235ebf 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -839,7 +839,7 @@ WILC_Sint32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInf
                u32Tsf_Lo = get_beacon_timestamp_lo(pu8msa);
                u32Tsf_Hi = get_beacon_timestamp_hi(pu8msa);
 
-               pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((WILC_Uint64)u32Tsf_Hi << 32);
+               pstrNetworkInfo->u64Tsf = u32Tsf_Lo | ((u64)u32Tsf_Hi << 32);
 
                /* Get SSID */
                get_ssid(pu8msa, pstrNetworkInfo->au8ssid, &(pstrNetworkInfo->u8SsidLen));

diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index c2a6d5b00bf751395d6513f68872be64f9074562..6d16bba79902174d0ad5ba4e9649ce1084e77046 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -429,7 +429,7 @@ typedef struct {
        u16 u16IEsLen;
        void *pJoinParams;
        tstrRSSI strRssi;
-       WILC_Uint64 u64Tsf; /* time-stamp [Low and High 64 bit] */
+       u64 u64Tsf; /* time-stamp [Low and High 64 bit] */
 } tstrNetworkInfo;
 
 /* This structure is used to support parsing of the received Association Response frame */

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index 85eb3f40e9d0c2ce43160f0626e7b7ba5ca6254d..a75efbfb1929c4663a0be0c7e1b1af3d6286a1de 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -406,7 +406,7 @@ typedef struct {
        /*Remain on channel struvture*/
        tstrHostIfRemainOnChan strHostIfRemainOnChan;
        u8 u8RemainOnChan_pendingreq;
-       WILC_Uint64 u64P2p_MgmtTimeout;
+       u64 u64P2p_MgmtTimeout;
        u8 u8P2PConnect;
        #endif
 

diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h
index 964e818b24a8418b844bf48447e7e68815b4e179..3af48da5751d81d08c8e45d7cd21fed470f1be89 100644 (file)
--- a/drivers/staging/wilc1000/wilc_oswrapper.h
+++ b/drivers/staging/wilc1000/wilc_oswrapper.h
@@ -14,7 +14,6 @@
 #define WILC_OSW_INTERFACE_VER 2
 
 /* Integer Types */
-typedef unsigned long long WILC_Uint64;
 typedef signed char WILC_Sint8;
 typedef signed short WILC_Sint16;
 typedef signed int WILC_Sint32;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 108d4533c4e484ce3a9b2324ffccd2a5a44d6385..10e6b1a22fd69dc9634d316c277166e84e8daff0 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -118,7 +118,7 @@ struct wilc_wfi_p2pListenParams {
        struct ieee80211_channel *pstrListenChan;
        enum nl80211_channel_type tenuChannelType;
        u32 u32ListenDuration;
-       WILC_Uint64 u64ListenCookie;
+       u64 u64ListenCookie;
        u32 u32ListenSessionID;
 };
 
@@ -130,7 +130,7 @@ struct WILC_WFI_priv {
 
        #ifdef WILC_P2P
        struct wilc_wfi_p2pListenParams strRemainOnChanParams;
-       WILC_Uint64 u64tx_cookie;
+       u64 u64tx_cookie;
 
        #endif