Merge tag 'ntb-4.4' of git://github.com/jonmason/ntb

[cascardo/linux.git] / drivers / staging / vt6655 / rf.c

diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index c537321..4c22bb3 100644 (file)
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -768,7 +768,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,
  */
 bool RFbSetPower(
        struct vnt_private *priv,
-       unsigned int uRATE,
+       unsigned int rate,
        u16 uCH
 )
 {
@@ -782,7 +782,7 @@ bool RFbSetPower(
        if ((uCH < 1) || (uCH > CB_MAX_CHANNEL))
                return false;
 
-       switch (uRATE) {
+       switch (rate) {
        case RATE_1M:
        case RATE_2M:
        case RATE_5M:
@@ -818,7 +818,7 @@ bool RFbSetPower(
        if (priv->byCurPwr == byPwr)
                return true;
 
-       bResult = RFbRawSetPower(priv, byPwr, uRATE);
+       bResult = RFbRawSetPower(priv, byPwr, rate);
        if (bResult)
                priv->byCurPwr = byPwr;
 
@@ -842,7 +842,7 @@ bool RFbSetPower(
 bool RFbRawSetPower(
        struct vnt_private *priv,
        unsigned char byPwr,
-       unsigned int uRATE
+       unsigned int rate
 )
 {
        bool bResult = true;
@@ -854,7 +854,7 @@ bool RFbRawSetPower(
        switch (priv->byRFType) {
        case RF_AIROHA:
                bResult &= IFRFbWriteEmbedded(priv, dwAL2230PowerTable[byPwr]);
-               if (uRATE <= RATE_11M)
+               if (rate <= RATE_11M)
                        bResult &= IFRFbWriteEmbedded(priv, 0x0001B400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
                else
                        bResult &= IFRFbWriteEmbedded(priv, 0x0005A400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
@@ -863,7 +863,7 @@ bool RFbRawSetPower(
 
        case RF_AL2230S:
                bResult &= IFRFbWriteEmbedded(priv, dwAL2230PowerTable[byPwr]);
-               if (uRATE <= RATE_11M) {
+               if (rate <= RATE_11M) {
                        bResult &= IFRFbWriteEmbedded(priv, 0x040C1400+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
                        bResult &= IFRFbWriteEmbedded(priv, 0x00299B00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW);
                } else {