1 files changed, 18 insertions, 67 deletions

diff --git a/drivers/staging/rt2860/rtmp_type.h b/drivers/staging/rt2860/rtmp_type.h
index 11e3591cf76f..8de142840d39 100644
--- a/drivers/staging/rt2860/rtmp_type.h
+++ b/drivers/staging/rt2860/rtmp_type.h
@@ -38,100 +38,51 @@
 #ifndef __RTMP_TYPE_H__
 #define __RTMP_TYPE_H__
 
-#define PACKED  __attribute__ ((packed))
-
-#ifdef LINUX
-/* Put platform dependent declaration here */
-/* For example, linux type definition */
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef unsigned long long UINT64;
-typedef int INT32;
-typedef long long INT64;
-#endif /* LINUX // */
-
-typedef unsigned char *PUINT8;
-typedef unsigned short *PUINT16;
-typedef unsigned int *PUINT32;
-typedef unsigned long long *PUINT64;
-typedef int *PINT32;
-typedef long long *PINT64;
-
-/* modified for fixing compile warning on Sigma 8634 platform */
-typedef char STRING;
-typedef signed char CHAR;
-
-typedef signed short SHORT;
-typedef signed int INT;
-typedef signed long LONG;
-typedef signed long long LONGLONG;
+#include <linux/types.h>
 
-#ifdef LINUX
-typedef unsigned char UCHAR;
-typedef unsigned short USHORT;
-typedef unsigned int UINT;
-typedef unsigned long ULONG;
-#endif /* LINUX // */
-typedef unsigned long long ULONGLONG;
+#define PACKED  __attribute__ ((packed))
 
 typedef unsigned char BOOLEAN;
-#ifdef LINUX
-typedef void VOID;
-#endif /* LINUX // */
-
-typedef char *PSTRING;
-typedef VOID *PVOID;
-typedef CHAR *PCHAR;
-typedef UCHAR *PUCHAR;
-typedef USHORT *PUSHORT;
-typedef LONG *PLONG;
-typedef ULONG *PULONG;
-typedef UINT *PUINT;
-
-typedef unsigned int NDIS_MEDIA_STATE;
 
 typedef union _LARGE_INTEGER {
 	struct {
-		UINT LowPart;
-		INT32 HighPart;
+		u32 LowPart;
+		int HighPart;
 	} u;
-	INT64 QuadPart;
+	long long QuadPart;
 } LARGE_INTEGER;
 
 /* */
 /* Register set pair for initialzation register set definition */
 /* */
 typedef struct _RTMP_REG_PAIR {
-	ULONG Register;
-	ULONG Value;
+	unsigned long Register;
+	unsigned long Value;
 } RTMP_REG_PAIR, *PRTMP_REG_PAIR;
 
 typedef struct _REG_PAIR {
-	UCHAR Register;
-	UCHAR Value;
+	u8 Register;
+	u8 Value;
 } REG_PAIR, *PREG_PAIR;
 
 /* */
 /* Register set pair for initialzation register set definition */
 /* */
 typedef struct _RTMP_RF_REGS {
-	UCHAR Channel;
-	ULONG R1;
-	ULONG R2;
-	ULONG R3;
-	ULONG R4;
+	u8 Channel;
+	unsigned long R1;
+	unsigned long R2;
+	unsigned long R3;
+	unsigned long R4;
 } RTMP_RF_REGS, *PRTMP_RF_REGS;
 
 typedef struct _FREQUENCY_ITEM {
-	UCHAR Channel;
-	UCHAR N;
-	UCHAR R;
-	UCHAR K;
+	u8 Channel;
+	u8 N;
+	u8 R;
+	u8 K;
 } FREQUENCY_ITEM, *PFREQUENCY_ITEM;
 
-typedef int NTSTATUS;
-
 #define STATUS_SUCCESS				0x00
 #define STATUS_UNSUCCESSFUL		0x01