Staging: rt28x0: remove typedefs (part one)

Remove typedefs from rtmp_type.h.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 39 insertions, 39 deletions

diff --git a/drivers/staging/rt2860/chips/rt3070.c b/drivers/staging/rt2860/chips/rt3070.c
index 4a6208765b6..beaaafa2b4a 100644
--- a/drivers/staging/rt2860/chips/rt3070.c
+++ b/drivers/staging/rt2860/chips/rt3070.c
@@ -43,25 +43,25 @@
 #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
 #endif /* RTMP_RF_RW_SUPPORT // */
 
-VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
+void NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
 {
-	INT i;
-	UCHAR RFValue;
+	int i;
+	u8 RFValue;
 
 	/* Driver must read EEPROM to get RfIcType before initial RF registers */
 	/* Initialize RF register to default value */
 	if (IS_RT3070(pAd) || IS_RT3071(pAd)) {
 		/* Init RF calibration */
 		/* Driver should toggle RF R30 bit7 before init RF registers */
-		UINT32 RfReg = 0;
-		UINT32 data;
+		u32 RfReg = 0;
+		u32 data;
 
-		RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR) & RfReg);
+		RT30xxReadRFRegister(pAd, RF_R30, (u8 *)& RfReg);
 		RfReg |= 0x80;
-		RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
+		RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
 		RTMPusecDelay(1000);
 		RfReg &= 0x7F;
-		RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
+		RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
 
 		/* Initialize RF register to default value */
 		for (i = 0; i < NUM_RF_REG_PARMS; i++) {
@@ -84,9 +84,9 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
 			}
 		} else if (IS_RT3071(pAd)) {
 			/* Driver should set RF R6 bit6 on before init RF registers */
-			RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR) & RfReg);
+			RT30xxReadRFRegister(pAd, RF_R06, (u8 *)& RfReg);
 			RfReg |= 0x40;
-			RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR) RfReg);
+			RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 
 			/* init R31 */
 			RT30xxWriteRFRegister(pAd, RF_R31, 0x14);
diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index cedacfb0879..b80928c902d 100644
--- a/drivers/staging/rt2860/chips/rt3090.c
+++ b/drivers/staging/rt2860/chips/rt3090.c
@@ -43,22 +43,22 @@
 #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
 #endif /* RTMP_RF_RW_SUPPORT // */
 
-VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd)
+void NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd)
 {
-	INT i;
+	int i;
 	/* Driver must read EEPROM to get RfIcType before initial RF registers */
 	/* Initialize RF register to default value */
 	if (IS_RT3090(pAd)) {
 		/* Init RF calibration */
 		/* Driver should toggle RF R30 bit7 before init RF registers */
-		UINT32 RfReg = 0, data;
+		u32 RfReg = 0, data;
 
-		RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR) & RfReg);
+		RT30xxReadRFRegister(pAd, RF_R30, (u8 *)& RfReg);
 		RfReg |= 0x80;
-		RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
+		RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
 		RTMPusecDelay(1000);
 		RfReg &= 0x7F;
-		RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
+		RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
 
 		/* init R24, R31 */
 		RT30xxWriteRFRegister(pAd, RF_R24, 0x0F);
@@ -90,9 +90,9 @@ VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd)
 		}
 
 		/* Driver should set RF R6 bit6 on before calibration */
-		RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR) & RfReg);
+		RT30xxReadRFRegister(pAd, RF_R06, (u8 *)& RfReg);
 		RfReg |= 0x40;
-		RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR) RfReg);
+		RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 
 		/*For RF filter Calibration */
 		RTMPFilterCalibration(pAd);
diff --git a/drivers/staging/rt2860/chips/rt30xx.c b/drivers/staging/rt2860/chips/rt30xx.c
index b03d94d851b..39b483cce0d 100644
--- a/drivers/staging/rt2860/chips/rt30xx.c
+++ b/drivers/staging/rt2860/chips/rt30xx.c
@@ -87,19 +87,19 @@ REG_PAIR RT30xx_RFRegTable[] = {
 	,
 };
 
-UCHAR NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR));
+u8 NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR));
 
 /* Antenna divesity use GPIO3 and EESK pin for control */
 /* Antenna and EEPROM access are both using EESK pin, */
 /* Therefor we should avoid accessing EESK at the same time */
 /* Then restore antenna after EEPROM access */
 /* The original name of this function is AsicSetRxAnt(), now change to */
-/*VOID AsicSetRxAnt( */
-VOID RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, IN UCHAR Ant)
+/*void AsicSetRxAnt( */
+void RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, u8 Ant)
 {
-	UINT32 Value;
+	u32 Value;
 #ifdef RTMP_MAC_PCI
-	UINT32 x;
+	u32 x;
 #endif
 
 	if ((pAd->EepromAccess) ||
@@ -159,11 +159,11 @@ VOID RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, IN UCHAR Ant)
 
 	========================================================================
 */
-VOID RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
+void RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
 {
-	UCHAR R55x = 0, value, FilterTarget = 0x1E, BBPValue = 0;
-	UINT loop = 0, count = 0, loopcnt = 0, ReTry = 0;
-	UCHAR RF_R24_Value = 0;
+	u8 R55x = 0, value, FilterTarget = 0x1E, BBPValue = 0;
+	u32 loop = 0, count = 0, loopcnt = 0, ReTry = 0;
+	u8 RF_R24_Value = 0;
 
 	/* Give bbp filter initial value */
 	pAd->Mlme.CaliBW20RfR24 = 0x1F;
@@ -263,10 +263,10 @@ VOID RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
 		if (loopcnt < 100) {
 			if (loop++ == 0) {
 				/*BandWidth = 20 MHz */
-				pAd->Mlme.CaliBW20RfR24 = (UCHAR) RF_R24_Value;
+				pAd->Mlme.CaliBW20RfR24 = (u8)RF_R24_Value;
 			} else {
 				/*BandWidth = 40 MHz */
-				pAd->Mlme.CaliBW40RfR24 = (UCHAR) RF_R24_Value;
+				pAd->Mlme.CaliBW40RfR24 = (u8)RF_R24_Value;
 				break;
 			}
 		} else
@@ -306,9 +306,9 @@ VOID RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
 
 	==========================================================================
  */
-VOID RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd)
+void RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd)
 {
-	UCHAR RFValue;
+	u8 RFValue;
 
 	/* RX0_PD & TX0_PD, RF R1 register Bit 2 & Bit 3 to 0 and RF_BLOCK_en,RX1_PD & TX1_PD, Bit0, Bit 4 & Bit5 to 1 */
 	RT30xxReadRFRegister(pAd, RF_R01, &RFValue);
@@ -372,10 +372,10 @@ VOID RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd)
 
 	==========================================================================
  */
-VOID RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
+void RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
 {
-	UCHAR RFValue;
-	UINT32 MACValue;
+	u8 RFValue;
+	u32 MACValue;
 
 #ifdef RTMP_MAC_USB
 	if (!IS_RT3572(pAd))
@@ -428,10 +428,10 @@ VOID RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
 
 	==========================================================================
  */
-VOID RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
+void RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
 {
-	UCHAR RFValue;
-	UINT32 MACValue;
+	u8 RFValue;
+	u32 MACValue;
 
 #ifdef RTMP_MAC_USB
 	if (!IS_RT3572(pAd))
@@ -493,9 +493,9 @@ VOID RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
 
 /* end johnli */
 
-VOID RT30xxHaltAction(IN PRTMP_ADAPTER pAd)
+void RT30xxHaltAction(IN PRTMP_ADAPTER pAd)
 {
-	UINT32 TxPinCfg = 0x00050F0F;
+	u32 TxPinCfg = 0x00050F0F;
 
 	/* */
 	/* Turn off LNA_PE or TRSW_POL */