diff options
| author | Chaehyun Lim <chaehyun.lim@gmail.com> | 2015-06-11 08:35:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-11 19:07:59 +0300 |
| commit | 8a54d91719a9cef4e599f6c699fb6a5136ed7a3f (patch) | |
| tree | 01df607325861a1ceec090c186cbfbf4bde7a763 | |
| parent | 3703480b02446b35e8427f6a114a5690b64324a8 (diff) | |
| download | linux-8a54d91719a9cef4e599f6c699fb6a5136ed7a3f.tar.xz | |
staging: wilc1000: remove UWORD32
Use u32 instead of UWORD32.
Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/coreconfigurator.c | 6 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/itypes.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 339b2a5c4384..d3a006937619 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -499,10 +499,10 @@ INLINE WILC_Uint32 get_beacon_timestamp_lo(u8 *data) return time_stamp; } -INLINE UWORD32 get_beacon_timestamp_hi(u8 *data) +INLINE u32 get_beacon_timestamp_hi(u8 *data) { - UWORD32 time_stamp = 0; - UWORD32 index = (MAC_HDR_LEN + 4); + u32 time_stamp = 0; + u32 index = (MAC_HDR_LEN + 4); time_stamp |= data[index++]; time_stamp |= (data[index++] << 8); diff --git a/drivers/staging/wilc1000/itypes.h b/drivers/staging/wilc1000/itypes.h index 91c8f0dca6d6..c99f8cabcaee 100644 --- a/drivers/staging/wilc1000/itypes.h +++ b/drivers/staging/wilc1000/itypes.h @@ -44,7 +44,6 @@ typedef int WORD32; typedef short WORD16; typedef char WORD8; -typedef unsigned int UWORD32; typedef unsigned short UWORD16; /*****************************************************************************/ |