From: Andres More <more.andres@gmail.com>
Date: Wed, 12 May 2010 21:59:45 +0000 (-0300)
Subject: staging: vt6656: code cleanup, replaced U16 macro with u16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26233e6e27e890d592708a3cd233667820c40254;p=linux-beck.git

staging: vt6656: code cleanup, replaced U16 macro with u16

Removed custom macro for unsigned 16-bit integers.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h
index 7fcf085bb4cd..27ba8b7fc0f6 100644
--- a/drivers/staging/vt6656/iocmd.h
+++ b/drivers/staging/vt6656/iocmd.h
@@ -111,8 +111,8 @@ typedef enum tagWZONETYPE {
 typedef struct tagSCmdRequest {
 	u8 name[16];
 	void	*data;
-	U16	    wResult;
-	U16     wCmdCode;
+	u16	    wResult;
+	u16     wCmdCode;
 } SCmdRequest, *PSCmdRequest;
 
 //
@@ -132,8 +132,8 @@ typedef struct tagSCmdScan {
 
 typedef struct tagSCmdBSSJoin {
 
-    U16	    wBSSType;
-    U16     wBBPType;
+    u16	    wBSSType;
+    u16     wBBPType;
     u8	    ssid[SSID_MAXLEN + 2];
     U32	    uChannel;
     BOOL    bPSEnable;
@@ -164,8 +164,8 @@ typedef struct tagSWPAResult {
 
 typedef struct tagSCmdStartAP {
 
-    U16	    wBSSType;
-    U16     wBBPType;
+    u16	    wBSSType;
+    u16     wBBPType;
     u8	    ssid[SSID_MAXLEN + 2];
     U32 	uChannel;
     U32     uBeaconInt;
@@ -192,8 +192,8 @@ typedef struct tagSBSSIDItem {
 	U32	    uChannel;
     u8      abyBSSID[BSSID_LEN];
     u8      abySSID[SSID_MAXLEN + 1];
-    U16	    wBeaconInterval;
-    U16	    wCapInfo;
+    u16	    wBeaconInterval;
+    u16	    wCapInfo;
     u8      byNetType;
     BOOL    bWEPOn;
     U32     uRSSI;
@@ -210,21 +210,21 @@ typedef struct tagSBSSIDList {
 
 typedef struct tagSNodeItem {
     // STA info
-    U16            wAID;
+    u16            wAID;
     u8             abyMACAddr[6];
-    U16            wTxDataRate;
-    U16            wInActiveCount;
-    U16            wEnQueueCnt;
-    U16            wFlags;
+    u16            wTxDataRate;
+    u16            wInActiveCount;
+    u16            wEnQueueCnt;
+    u16            wFlags;
     BOOL           bPWBitOn;
     u8             byKeyIndex;
-    U16            wWepKeyLength;
+    u16            wWepKeyLength;
     u8            abyWepKey[WEP_KEYMAXLEN];
     // Auto rate fallback vars
     BOOL           bIsInFallback;
     U32            uTxFailures;
     U32            uTxAttempts;
-    U16            wFailureRatio;
+    u16            wFailureRatio;
 
 } SNodeItem;
 
@@ -240,7 +240,7 @@ typedef struct tagSNodeList {
 typedef struct tagSCmdLinkStatus {
 
     BOOL    bLink;
-	U16	    wBSSType;
+	u16	    wBSSType;
 	u8      byState;
     u8      abyBSSID[BSSID_LEN];
     u8      abySSID[SSID_MAXLEN + 2];
@@ -418,8 +418,8 @@ struct viawget_hostapd_param {
 	u8 sta_addr[6];
 	union {
 		struct {
-			U16 aid;
-			U16 capability;
+			u16 aid;
+			u16 capability;
 			u8 tx_supp_rates;
 		} add_sta;
 		struct {
@@ -431,7 +431,7 @@ struct viawget_hostapd_param {
 			U32 err;
 			u8 idx;
 			u8 seq[8];
-			U16 key_len;
+			u16 key_len;
 			u8 key[0];
 		} crypt;
 		struct {
@@ -439,8 +439,8 @@ struct viawget_hostapd_param {
 			U32 flags_or;
 		} set_flags_sta;
 		struct {
-			U16 rid;
-			U16 len;
+			u16 rid;
+			u16 len;
 			u8 data[0];
 		} rid;
 		struct {
@@ -448,8 +448,8 @@ struct viawget_hostapd_param {
 			u8 data[0];
 		} generic_elem;
 		struct {
-			U16 cmd;
-			U16 reason_code;
+			u16 cmd;
+			u16 reason_code;
 		} mlme;
 		struct {
 			u8 ssid_len;
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
index d7cf663f445f..2b8419af7907 100644
--- a/drivers/staging/vt6656/ttype.h
+++ b/drivers/staging/vt6656/ttype.h
@@ -79,7 +79,6 @@ typedef int             BOOL;
 
 typedef signed char             I8;     /* 8-bit signed integer */
 
-typedef unsigned short          U16;    /* 16-bit unsigned integer */
 typedef unsigned long           U32;    /* 32-bit unsigned integer */
 
 typedef char            CHAR;