From: Charles Clément <caratorn@gmail.com>
Date: Tue, 22 Jun 2010 15:54:41 +0000 (-0700)
Subject: Staging: vt6655: remove ULONG_PTR typedef
X-Git-Tag: v2.6.36-rc1~520^2~1^2~344
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dec572cbe67598080f7beb00279db1a5590cec35;p=karo-tx-linux.git

Staging: vt6655: remove ULONG_PTR typedef

Signed-off-by: Charles Clément <caratorn@gmail.com>
---

diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index 20f5d29bc411..3196eb53ab30 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -471,7 +471,7 @@ BSSbInsertToBSSList (
     if (pRSNWPA != NULL) {
         unsigned int uLen = pRSNWPA->len + 2;
 
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
             pBSSList->wWPALen = uLen;
             memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
             WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -482,7 +482,7 @@ BSSbInsertToBSSList (
 
     if (pRSN != NULL) {
         unsigned int uLen = pRSN->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
             pBSSList->wRSNLen = uLen;
             memcpy(pBSSList->byRSNIE, pRSN, uLen);
             WPA2vParseRSN(pBSSList, pRSN);
@@ -671,7 +671,7 @@ BSSbUpdateToBSSList (
 
     if (pRSNWPA != NULL) {
         unsigned int uLen = pRSNWPA->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
             pBSSList->wWPALen = uLen;
             memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
             WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -682,7 +682,7 @@ BSSbUpdateToBSSList (
 
     if (pRSN != NULL) {
         unsigned int uLen = pRSN->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
             pBSSList->wRSNLen = uLen;
             memcpy(pBSSList->byRSNIE, pRSN, uLen);
             WPA2vParseRSN(pBSSList, pRSN);
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index aaad1dbd957d..c684f1a4c91e 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@@ -86,7 +86,6 @@ typedef UQuadWord       QWORD;          // 64-bit
 
 /****** Common pointer types ***********************************************/
 
-typedef unsigned long   ULONG_PTR;      // 32-bit
 typedef unsigned long   DWORD_PTR;      // 32-bit
 
 // boolean pointer