Staging: rt2860: fix coding style issue in rt3070.c, rt3090.c, rt30xx.c

This is a patch to the rt3070.c, rt3090.c, rt30xx.c files that fixes up
errors found by the checkpatch.pl tool

Signed-off-by: Gorskin Ilya <revent82@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/chips/rt3070.c b/drivers/staging/rt2860/chips/rt3070.c
index 627bad943a3c92787f5cd882c227baa14e655fa2..3a17fd10ec1fb37416fcb978193ae37429edc613 100644 (file)
--- a/drivers/staging/rt2860/chips/rt3070.c
+++ b/drivers/staging/rt2860/chips/rt3070.c
@@ -56,7 +56,7 @@ void NICInitRT3070RFRegisters(struct rt_rtmp_adapter *pAd)
                u32 RfReg = 0;
                u32 data;
 
                u32 RfReg = 0;
                u32 data;
 

-               RT30xxReadRFRegister(pAd, RF_R30, (u8 *)& RfReg);
+               RT30xxReadRFRegister(pAd, RF_R30, (u8 *)&RfReg);

                RfReg |= 0x80;
                RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
                RTMPusecDelay(1000);
                RfReg |= 0x80;
                RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
                RTMPusecDelay(1000);


@@ -84,7 +84,7 @@ void NICInitRT3070RFRegisters(struct rt_rtmp_adapter *pAd)
                        }
                } else if (IS_RT3071(pAd)) {
                        /* Driver should set RF R6 bit6 on before init RF registers */
                        }
                } else if (IS_RT3071(pAd)) {
                        /* Driver should set RF R6 bit6 on before init RF registers */

-                       RT30xxReadRFRegister(pAd, RF_R06, (u8 *)& RfReg);
+                       RT30xxReadRFRegister(pAd, RF_R06, (u8 *)&RfReg);

                        RfReg |= 0x40;
                        RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 
                        RfReg |= 0x40;
                        RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 

diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index 5927ba4c5a9b32be4b12f7496e654b4383ca6575..c2933c69bc0476fea8e2d12a498f4aa34a2c4847 100644 (file)
--- a/drivers/staging/rt2860/chips/rt3090.c
+++ b/drivers/staging/rt2860/chips/rt3090.c
@@ -53,7 +53,7 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
                /* Driver should toggle RF R30 bit7 before init RF registers */
                u32 RfReg = 0, data;
 
                /* Driver should toggle RF R30 bit7 before init RF registers */
                u32 RfReg = 0, data;
 

-               RT30xxReadRFRegister(pAd, RF_R30, (u8 *)& RfReg);
+               RT30xxReadRFRegister(pAd, RF_R30, (u8 *)&RfReg);

                RfReg |= 0x80;
                RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
                RTMPusecDelay(1000);
                RfReg |= 0x80;
                RT30xxWriteRFRegister(pAd, RF_R30, (u8)RfReg);
                RTMPusecDelay(1000);


@@ -90,7 +90,7 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
                }
 
                /* Driver should set RF R6 bit6 on before calibration */
                }
 
                /* Driver should set RF R6 bit6 on before calibration */

-               RT30xxReadRFRegister(pAd, RF_R06, (u8 *)& RfReg);
+               RT30xxReadRFRegister(pAd, RF_R06, (u8 *)&RfReg);

                RfReg |= 0x40;
                RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 
                RfReg |= 0x40;
                RT30xxWriteRFRegister(pAd, RF_R06, (u8)RfReg);
 

diff --git a/drivers/staging/rt2860/chips/rt30xx.c b/drivers/staging/rt2860/chips/rt30xx.c
index 6e684a3ccf0ec9038a34f909f6386dc3cf268763..4367a196aeff18b9f4192b88a5c83e6d65464952 100644 (file)
--- a/drivers/staging/rt2860/chips/rt30xx.c
+++ b/drivers/staging/rt2860/chips/rt30xx.c
@@ -170,8 +170,7 @@ void RTMPFilterCalibration(struct rt_rtmp_adapter *pAd)
        pAd->Mlme.CaliBW40RfR24 = 0x2F; /*Bit[5] must be 1 for BW 40 */
 
        do {
        pAd->Mlme.CaliBW40RfR24 = 0x2F; /*Bit[5] must be 1 for BW 40 */
 
        do {

-               if (loop == 1)  /*BandWidth = 40 MHz */
-               {
+               if (loop == 1) {        /*BandWidth = 40 MHz */

                        /* Write 0x27 to RF_R24 to program filter */
                        RF_R24_Value = 0x27;
                        RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
                        /* Write 0x27 to RF_R24 to program filter */
                        RF_R24_Value = 0x27;
                        RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);


@@ -190,8 +189,7 @@ void RTMPFilterCalibration(struct rt_rtmp_adapter *pAd)
                        RT30xxReadRFRegister(pAd, RF_R31, &value);
                        value |= 0x20;
                        RT30xxWriteRFRegister(pAd, RF_R31, value);
                        RT30xxReadRFRegister(pAd, RF_R31, &value);
                        value |= 0x20;
                        RT30xxWriteRFRegister(pAd, RF_R31, value);

-               } else          /*BandWidth = 20 MHz */
-               {
+               } else {        /*BandWidth = 20 MHz */

                        /* Write 0x07 to RF_R24 to program filter */
                        RF_R24_Value = 0x07;
                        RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
                        /* Write 0x07 to RF_R24 to program filter */
                        RF_R24_Value = 0x07;
                        RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);


@@ -353,8 +351,7 @@ void RT30xxLoadRFNormalModeSetup(struct rt_rtmp_adapter *pAd)
        RT30xxReadRFRegister(pAd, RF_R27, &RFValue);
        /* TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F). */
        /* Raising RF voltage is no longer needed for RT3070(F) */
        RT30xxReadRFRegister(pAd, RF_R27, &RFValue);
        /* TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F). */
        /* Raising RF voltage is no longer needed for RT3070(F) */

-       if (IS_RT3090(pAd))     /* RT309x and RT3071/72 */
-       {
+       if (IS_RT3090(pAd)) {   /* RT309x and RT3071/72 */

                if ((pAd->MACVersion & 0xffff) < 0x0211)
                        RFValue = (RFValue & (~0x77)) | 0x3;
                else
                if ((pAd->MACVersion & 0xffff) < 0x0211)
                        RFValue = (RFValue & (~0x77)) | 0x3;
                else