From c17ce8c21d809c62b427bf8e2d2672ebe0904fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= <caratorn@gmail.com>
Date: Fri, 28 May 2010 12:34:20 -0700
Subject: [PATCH 052/524] Staging: vt6655: remove U16 custom macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove custom macro for unsigned 16-bit integers.

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/vt6655/desc.h        |    4 +-
 drivers/staging/vt6655/device_main.c |    4 +-
 drivers/staging/vt6655/iocmd.h       |   50 +++++++++++++++++-----------------
 drivers/staging/vt6655/ttype.h       |    1 -
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index b4327c0..d99b19a 100644
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -257,7 +257,7 @@ SRDES0;
 typedef struct tagRDES0 {
    volatile WORD    wResCount;
 	union {
-		volatile U16    f15Reserved;
+		volatile u16    f15Reserved;
 		struct {
             volatile u8 f8Reserved1;
 			volatile u8 f1Owner:1;
@@ -317,7 +317,7 @@ typedef struct tagTDES0 {
     volatile    BYTE    byTSR0;
     volatile    BYTE    byTSR1;
 	union {
-		volatile U16    f15Txtime;
+		volatile u16    f15Txtime;
 		struct {
             volatile u8 f8Reserved1;
 			volatile u8 f1Owner:1;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 12d1e8b..06585c1 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1150,14 +1150,14 @@ static BOOL device_init_info(struct pci_dev* pcid, PSDevice* ppDevice,
 
 static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) {
 
-    U16 pci_cmd;
+    u16 pci_cmd;
     u8  b;
     UINT cis_addr;
 #ifdef	PLICE_DEBUG
 	BYTE       pci_config[256];
 	BYTE	value =0x00;
 	int		ii,j;
-	U16	max_lat=0x0000;
+	u16	max_lat=0x0000;
 	memset(pci_config,0x00,256);
 #endif
 
diff --git a/drivers/staging/vt6655/iocmd.h b/drivers/staging/vt6655/iocmd.h
index aedcefe..d61f596 100644
--- a/drivers/staging/vt6655/iocmd.h
+++ b/drivers/staging/vt6655/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;
@@ -193,12 +193,12 @@ typedef struct tagSBSSIDItem {
     u8      abyBSSID[BSSID_LEN];
     u8      abySSID[SSID_MAXLEN + 1];
     //2006-1116-01,<Modify> by NomadZhao
-    //U16	    wBeaconInterval;
-    //U16	    wCapInfo;
+    //u16	    wBeaconInterval;
+    //u16	    wCapInfo;
     //u8      byNetType;
     u8      byNetType;
-    U16	    wBeaconInterval;
-    U16	    wCapInfo;        // for address of byNetType at align 4
+    u16	    wBeaconInterval;
+    u16	    wCapInfo;        // for address of byNetType at align 4
 
     BOOL    bWEPOn;
     U32     uRSSI;
@@ -216,7 +216,7 @@ typedef struct tagSBSSIDList {
 typedef struct tagSCmdLinkStatus {
 
     BOOL    bLink;
-	U16	    wBSSType;
+	u16   wBSSType;
 	u8      byState;
     u8      abyBSSID[BSSID_LEN];
     u8      abySSID[SSID_MAXLEN + 2];
@@ -353,21 +353,21 @@ typedef struct tagSStatMIBCount {
 
 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;
 
@@ -422,8 +422,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 {
@@ -435,7 +435,7 @@ struct viawget_hostapd_param {
 			U32 err;
 			u8 idx;
 			u8 seq[8];
-			U16 key_len;
+			u16 key_len;
 			u8 key[0];
 		} crypt;
 		struct {
@@ -443,8 +443,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 {
@@ -452,8 +452,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/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index 105cabc..fd1efeb 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@@ -68,7 +68,6 @@ typedef int             BOOL;
  * but it doesn't matter if they're signed or unsigned.
  */
 
-typedef unsigned short          U16;    /* 16-bit unsigned integer */
 typedef unsigned long           U32;    /* 32-bit unsigned integer */
 
 
-- 
1.7.1