Staging: vt6655: Replace dwIoBase by iobase

In this patch dwIoBase is renamed as iobase. This is done to fix the
checkpatch issue of CamelCase.

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 2696f50..44dfa54 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1911,7 +1911,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byBBAddr    - address of register in Baseband
  *  Out:
  *      pbyData     - data read
@@ -1922,24 +1922,24 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
 bool BBbReadEmbedded(struct vnt_private *priv,
                     unsigned char byBBAddr, unsigned char *pbyData)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        unsigned short ww;
        unsigned char byValue;
 
        /* BB reg offset */
-       VNSvOutPortB(dwIoBase + MAC_REG_BBREGADR, byBBAddr);
+       VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr);
 
        /* turn on REGR */
-       MACvRegBitsOn(dwIoBase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
+       MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
        /* W_MAX_TIMEOUT is the timeout period */
        for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-               VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue);
+               VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue);
                if (byValue & BBREGCTL_DONE)
                        break;
        }
 
        /* get BB data */
-       VNSvInPortB(dwIoBase + MAC_REG_BBREGDATA, pbyData);
+       VNSvInPortB(iobase + MAC_REG_BBREGDATA, pbyData);
 
        if (ww == W_MAX_TIMEOUT) {
                pr_debug(" DBG_PORT80(0x30)\n");
@@ -1953,7 +1953,7 @@ bool BBbReadEmbedded(struct vnt_private *priv,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byBBAddr    - address of register in Baseband
  *      byData      - data to write
  *  Out:
@@ -1965,20 +1965,20 @@ bool BBbReadEmbedded(struct vnt_private *priv,
 bool BBbWriteEmbedded(struct vnt_private *priv,
                      unsigned char byBBAddr, unsigned char byData)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        unsigned short ww;
        unsigned char byValue;
 
        /* BB reg offset */
-       VNSvOutPortB(dwIoBase + MAC_REG_BBREGADR, byBBAddr);
+       VNSvOutPortB(iobase + MAC_REG_BBREGADR, byBBAddr);
        /* set BB data */
-       VNSvOutPortB(dwIoBase + MAC_REG_BBREGDATA, byData);
+       VNSvOutPortB(iobase + MAC_REG_BBREGDATA, byData);
 
        /* turn on BBREGCTL_REGW */
-       MACvRegBitsOn(dwIoBase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
+       MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
        /* W_MAX_TIMEOUT is the timeout period */
        for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-               VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue);
+               VNSvInPortB(iobase + MAC_REG_BBREGCTL, &byValue);
                if (byValue & BBREGCTL_DONE)
                        break;
        }
@@ -1995,7 +1995,7 @@ bool BBbWriteEmbedded(struct vnt_private *priv,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      byRevId     - Revision ID
  *      byRFType    - RF type
  *  Out:
@@ -2009,7 +2009,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
 {
        bool bResult = true;
        int        ii;
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        unsigned char byRFType = priv->byRFType;
        unsigned char byLocalID = priv->byLocalID;
 
@@ -2031,8 +2031,8 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                        byVT3253B0_AGC4_RFMD2959[ii][0],
                                        byVT3253B0_AGC4_RFMD2959[ii][1]);
 
-                       VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET, 0x23);
-                       MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT(0));
+                       VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23);
+                       MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0));
                }
                priv->abyBBVGA[0] = 0x18;
                priv->abyBBVGA[1] = 0x0A;
@@ -2071,8 +2071,8 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                byVT3253B0_AGC[ii][0],
                                byVT3253B0_AGC[ii][1]);
 
-               VNSvOutPortB(dwIoBase + MAC_REG_ITRTMSET, 0x23);
-               MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY, BIT(0));
+               VNSvOutPortB(iobase + MAC_REG_ITRTMSET, 0x23);
+               MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0));
 
                priv->abyBBVGA[0] = 0x14;
                priv->abyBBVGA[1] = 0x0A;
@@ -2093,7 +2093,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                 * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                 */
 
-               /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/
+               /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/
 
                /* Init ANT B select,
                 * RX Config CR10 = 0x28->0x2A,
@@ -2101,7 +2101,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                 * make the ANT_A, ANT_B inverted)
                 */
 
-               /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
+               /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/
                /* Select VC1/VC2, CR215 = 0x02->0x06 */
                bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);
 
@@ -2149,7 +2149,7 @@ bool BBbVT3253Init(struct vnt_private *priv)
                priv->ldBmThreshold[2] = 0;
                priv->ldBmThreshold[3] = 0;
                /* Fix VT3226 DFC system timing issue */
-               MACvSetRFLE_LatchBase(dwIoBase);
+               MACvSetRFLE_LatchBase(iobase);
                /* {{ RobertYu: 20050104 */
        } else if (byRFType == RF_AIROHA7230) {
                for (ii = 0; ii < CB_VT3253B0_INIT_FOR_AIROHA2230; ii++)
@@ -2161,11 +2161,11 @@ bool BBbVT3253Init(struct vnt_private *priv)
                /* Init ANT B select,TX Config CR09 = 0x61->0x45,
                 * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                 */
-               /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/
+               /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/
                /* Init ANT B select,RX Config CR10 = 0x28->0x2A,
                 * 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted)
                 */
-               /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
+               /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/
                /* Select VC1/VC2, CR215 = 0x02->0x06 */
                bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);
                /* }} */
@@ -2253,7 +2253,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -2274,7 +2274,7 @@ BBvSoftwareReset(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -2296,7 +2296,7 @@ BBvPowerSaveModeON(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 2e2f96d..928c336 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -32,7 +32,7 @@
  *
  * Revision History:
  *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253 spec.
- *      08-26-2003 Kyle Hsu:      Modify the defination type of dwIoBase.
+ *      08-26-2003 Kyle Hsu:      Modify the defination type of iobase.
  *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS().
  *
  */
@@ -934,20 +934,20 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
  */
 bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        unsigned short ww;
        unsigned char byData;
 
-       MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD);
+       MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD);
        for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-               VNSvInPortB(dwIoBase + MAC_REG_TFTCTL, &byData);
+               VNSvInPortB(iobase + MAC_REG_TFTCTL, &byData);
                if (!(byData & TFTCTL_TSFCNTRRD))
                        break;
        }
        if (ww == W_MAX_TIMEOUT)
                return false;
-       VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF);
-       VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1);
+       VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF);
+       VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1);
 
        return true;
 }
@@ -985,7 +985,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - IO Base
+ *      iobase          - IO Base
  *      wBeaconInterval - Beacon Interval
  *  Out:
  *      none
@@ -995,16 +995,16 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
 void CARDvSetFirstNextTBTT(struct vnt_private *priv,
                           unsigned short wBeaconInterval)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        u64 qwNextTBTT = 0;
 
        CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */
 
        qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
        /* Set NextTBTT */
-       VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
-       VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
-       MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
+       VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
+       VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
+       MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
 }
 
 /*
@@ -1024,12 +1024,12 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
 void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
                         unsigned short wBeaconInterval)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
 
        qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
        /* Set NextTBTT */
-       VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwTSF);
-       VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32));
-       MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
+       VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF);
+       VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32));
+       MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
        pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF);
 }

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index d7faaf9..33b758c 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -549,341 +549,341 @@
 
 /*---------------------  Export Macros ------------------------------*/
 
-#define MACvRegBitsOn(dwIoBase, byRegOfs, byBits)                      \
+#define MACvRegBitsOn(iobase, byRegOfs, byBits)                        \
 do {                                                                   \
        unsigned char byData;                                           \
-       VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
-       VNSvOutPortB(dwIoBase + byRegOfs, byData | (byBits));           \
+       VNSvInPortB(iobase + byRegOfs, &byData);                        \
+       VNSvOutPortB(iobase + byRegOfs, byData | (byBits));             \
 } while (0)
 
-#define MACvWordRegBitsOn(dwIoBase, byRegOfs, wBits)                   \
+#define MACvWordRegBitsOn(iobase, byRegOfs, wBits)                     \
 do {                                                                   \
        unsigned short wData;                                           \
-       VNSvInPortW(dwIoBase + byRegOfs, &wData);                       \
-       VNSvOutPortW(dwIoBase + byRegOfs, wData | (wBits));             \
+       VNSvInPortW(iobase + byRegOfs, &wData);                 \
+       VNSvOutPortW(iobase + byRegOfs, wData | (wBits));               \
 } while (0)
 
-#define MACvDWordRegBitsOn(dwIoBase, byRegOfs, dwBits)                 \
+#define MACvDWordRegBitsOn(iobase, byRegOfs, dwBits)                   \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + byRegOfs, &dwData);                      \
-       VNSvOutPortD(dwIoBase + byRegOfs, dwData | (dwBits));           \
+       VNSvInPortD(iobase + byRegOfs, &dwData);                        \
+       VNSvOutPortD(iobase + byRegOfs, dwData | (dwBits));             \
 } while (0)
 
-#define MACvRegBitsOnEx(dwIoBase, byRegOfs, byMask, byBits)            \
+#define MACvRegBitsOnEx(iobase, byRegOfs, byMask, byBits)              \
 do {                                                                   \
        unsigned char byData;                                           \
-       VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
+       VNSvInPortB(iobase + byRegOfs, &byData);                        \
        byData &= byMask;                                               \
-       VNSvOutPortB(dwIoBase + byRegOfs, byData | (byBits));           \
+       VNSvOutPortB(iobase + byRegOfs, byData | (byBits));             \
 } while (0)
 
-#define MACvRegBitsOff(dwIoBase, byRegOfs, byBits)                     \
+#define MACvRegBitsOff(iobase, byRegOfs, byBits)                       \
 do {                                                                   \
        unsigned char byData;                                           \
-       VNSvInPortB(dwIoBase + byRegOfs, &byData);                      \
-       VNSvOutPortB(dwIoBase + byRegOfs, byData & ~(byBits));          \
+       VNSvInPortB(iobase + byRegOfs, &byData);                        \
+       VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits));            \
 } while (0)
 
-#define MACvWordRegBitsOff(dwIoBase, byRegOfs, wBits)                  \
+#define MACvWordRegBitsOff(iobase, byRegOfs, wBits)                    \
 do {                                                                   \
        unsigned short wData;                                           \
-       VNSvInPortW(dwIoBase + byRegOfs, &wData);                       \
-       VNSvOutPortW(dwIoBase + byRegOfs, wData & ~(wBits));            \
+       VNSvInPortW(iobase + byRegOfs, &wData);                 \
+       VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits));              \
 } while (0)
 
-#define MACvDWordRegBitsOff(dwIoBase, byRegOfs, dwBits)                        \
+#define MACvDWordRegBitsOff(iobase, byRegOfs, dwBits)                  \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + byRegOfs, &dwData);                      \
-       VNSvOutPortD(dwIoBase + byRegOfs, dwData & ~(dwBits));          \
+       VNSvInPortD(iobase + byRegOfs, &dwData);                        \
+       VNSvOutPortD(iobase + byRegOfs, dwData & ~(dwBits));            \
 } while (0)
 
-#define MACvGetCurrRx0DescAddr(dwIoBase, pdwCurrDescAddr)      \
-       VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0,               \
+#define MACvGetCurrRx0DescAddr(iobase, pdwCurrDescAddr)        \
+       VNSvInPortD(iobase + MAC_REG_RXDMAPTR0,         \
                    (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrRx1DescAddr(dwIoBase, pdwCurrDescAddr)      \
-       VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1,               \
+#define MACvGetCurrRx1DescAddr(iobase, pdwCurrDescAddr)        \
+       VNSvInPortD(iobase + MAC_REG_RXDMAPTR1,         \
                    (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrTx0DescAddr(dwIoBase, pdwCurrDescAddr)      \
-       VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0,               \
+#define MACvGetCurrTx0DescAddr(iobase, pdwCurrDescAddr)        \
+       VNSvInPortD(iobase + MAC_REG_TXDMAPTR0,         \
                    (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrAC0DescAddr(dwIoBase, pdwCurrDescAddr)      \
-       VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR,               \
+#define MACvGetCurrAC0DescAddr(iobase, pdwCurrDescAddr)        \
+       VNSvInPortD(iobase + MAC_REG_AC0DMAPTR,         \
                    (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrSyncDescAddr(dwIoBase, pdwCurrDescAddr)     \
-       VNSvInPortD(dwIoBase + MAC_REG_SYNCDMAPTR,              \
+#define MACvGetCurrSyncDescAddr(iobase, pdwCurrDescAddr)       \
+       VNSvInPortD(iobase + MAC_REG_SYNCDMAPTR,                \
                    (unsigned long *)pdwCurrDescAddr)
 
-#define MACvGetCurrATIMDescAddr(dwIoBase, pdwCurrDescAddr)     \
-       VNSvInPortD(dwIoBase + MAC_REG_ATIMDMAPTR,              \
+#define MACvGetCurrATIMDescAddr(iobase, pdwCurrDescAddr)       \
+       VNSvInPortD(iobase + MAC_REG_ATIMDMAPTR,                \
                    (unsigned long *)pdwCurrDescAddr)
 
 /* set the chip with current BCN tx descriptor address */
-#define MACvSetCurrBCNTxDescAddr(dwIoBase, dwCurrDescAddr)     \
-       VNSvOutPortD(dwIoBase + MAC_REG_BCNDMAPTR,              \
+#define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr)       \
+       VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR,                \
                     dwCurrDescAddr)
 
 /* set the chip with current BCN length */
-#define MACvSetCurrBCNLength(dwIoBase, wCurrBCNLength)         \
-       VNSvOutPortW(dwIoBase + MAC_REG_BCNDMACTL+2,            \
+#define MACvSetCurrBCNLength(iobase, wCurrBCNLength)           \
+       VNSvOutPortW(iobase + MAC_REG_BCNDMACTL+2,              \
                     wCurrBCNLength)
 
-#define MACvReadBSSIDAddress(dwIoBase, pbyEtherAddr)           \
+#define MACvReadBSSIDAddress(iobase, pbyEtherAddr)             \
 do {                                                           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0,                  \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+       VNSvInPortB(iobase + MAC_REG_BSSID0,                    \
                    (unsigned char *)pbyEtherAddr);             \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 1,              \
+       VNSvInPortB(iobase + MAC_REG_BSSID0 + 1,                \
                    pbyEtherAddr + 1);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 2,              \
+       VNSvInPortB(iobase + MAC_REG_BSSID0 + 2,                \
                    pbyEtherAddr + 2);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 3,              \
+       VNSvInPortB(iobase + MAC_REG_BSSID0 + 3,                \
                    pbyEtherAddr + 3);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 4,              \
+       VNSvInPortB(iobase + MAC_REG_BSSID0 + 4,                \
                    pbyEtherAddr + 4);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_BSSID0 + 5,              \
+       VNSvInPortB(iobase + MAC_REG_BSSID0 + 5,                \
                    pbyEtherAddr + 5);                          \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvWriteBSSIDAddress(dwIoBase, pbyEtherAddr)          \
+#define MACvWriteBSSIDAddress(iobase, pbyEtherAddr)            \
 do {                                                           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0,                 \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0,                   \
                     *(pbyEtherAddr));                          \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 1,             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0 + 1,               \
                     *(pbyEtherAddr + 1));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 2,             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0 + 2,               \
                     *(pbyEtherAddr + 2));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 3,             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0 + 3,               \
                     *(pbyEtherAddr + 3));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 4,             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0 + 4,               \
                     *(pbyEtherAddr + 4));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_BSSID0 + 5,             \
+       VNSvOutPortB(iobase + MAC_REG_BSSID0 + 5,               \
                     *(pbyEtherAddr + 5));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvReadEtherAddress(dwIoBase, pbyEtherAddr)           \
+#define MACvReadEtherAddress(iobase, pbyEtherAddr)             \
 do {                                                           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0,                    \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+       VNSvInPortB(iobase + MAC_REG_PAR0,                      \
                    (unsigned char *)pbyEtherAddr);             \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 1,                \
+       VNSvInPortB(iobase + MAC_REG_PAR0 + 1,          \
                    pbyEtherAddr + 1);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 2,                \
+       VNSvInPortB(iobase + MAC_REG_PAR0 + 2,          \
                    pbyEtherAddr + 2);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 3,                \
+       VNSvInPortB(iobase + MAC_REG_PAR0 + 3,          \
                    pbyEtherAddr + 3);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 4,                \
+       VNSvInPortB(iobase + MAC_REG_PAR0 + 4,          \
                    pbyEtherAddr + 4);                          \
-       VNSvInPortB(dwIoBase + MAC_REG_PAR0 + 5,                \
+       VNSvInPortB(iobase + MAC_REG_PAR0 + 5,          \
                    pbyEtherAddr + 5);                          \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvWriteEtherAddress(dwIoBase, pbyEtherAddr)          \
+#define MACvWriteEtherAddress(iobase, pbyEtherAddr)            \
 do {                                                           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0,                   \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+       VNSvOutPortB(iobase + MAC_REG_PAR0,                     \
                     *pbyEtherAddr);                            \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 1,               \
+       VNSvOutPortB(iobase + MAC_REG_PAR0 + 1,         \
                     *(pbyEtherAddr + 1));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 2,               \
+       VNSvOutPortB(iobase + MAC_REG_PAR0 + 2,         \
                     *(pbyEtherAddr + 2));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 3,               \
+       VNSvOutPortB(iobase + MAC_REG_PAR0 + 3,         \
                     *(pbyEtherAddr + 3));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 4,               \
+       VNSvOutPortB(iobase + MAC_REG_PAR0 + 4,         \
                     *(pbyEtherAddr + 4));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAR0 + 5,               \
+       VNSvOutPortB(iobase + MAC_REG_PAR0 + 5,         \
                     *(pbyEtherAddr + 5));                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvClearISR(dwIoBase)                                         \
-       VNSvOutPortD(dwIoBase + MAC_REG_ISR, IMR_MASK_VALUE)
+#define MACvClearISR(iobase)                                           \
+       VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE)
 
-#define MACvStart(dwIoBase)                                            \
-       VNSvOutPortB(dwIoBase + MAC_REG_HOSTCR,                         \
+#define MACvStart(iobase)                                              \
+       VNSvOutPortB(iobase + MAC_REG_HOSTCR,                           \
                     (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON))
 
-#define MACvRx0PerPktMode(dwIoBase)                                    \
-       VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKT)
+#define MACvRx0PerPktMode(iobase)                                      \
+       VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT)
 
-#define MACvRx0BufferFillMode(dwIoBase)                                        \
-       VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKTCLR)
+#define MACvRx0BufferFillMode(iobase)                                  \
+       VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR)
 
-#define MACvRx1PerPktMode(dwIoBase)                                    \
-       VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKT)
+#define MACvRx1PerPktMode(iobase)                                      \
+       VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT)
 
-#define MACvRx1BufferFillMode(dwIoBase)                                        \
-       VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKTCLR)
+#define MACvRx1BufferFillMode(iobase)                                  \
+       VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR)
 
-#define MACvRxOn(dwIoBase)                                             \
-       MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_RXON)
+#define MACvRxOn(iobase)                                               \
+       MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON)
 
-#define MACvReceive0(dwIoBase)                                         \
+#define MACvReceive0(iobase)                                           \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0, &dwData);             \
+       VNSvInPortD(iobase + MAC_REG_RXDMACTL0, &dwData);               \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \
 } while (0)
 
-#define MACvReceive1(dwIoBase)                                         \
+#define MACvReceive1(iobase)                                           \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1, &dwData);             \
+       VNSvInPortD(iobase + MAC_REG_RXDMACTL1, &dwData);               \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \
 } while (0)
 
-#define MACvTxOn(dwIoBase)                                             \
-       MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_TXON)
+#define MACvTxOn(iobase)                                               \
+       MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON)
 
-#define MACvTransmit0(dwIoBase)                                                \
+#define MACvTransmit0(iobase)                                          \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0, &dwData);             \
+       VNSvInPortD(iobase + MAC_REG_TXDMACTL0, &dwData);               \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitAC0(dwIoBase)                                      \
+#define MACvTransmitAC0(iobase)                                        \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL, &dwData);             \
+       VNSvInPortD(iobase + MAC_REG_AC0DMACTL, &dwData);               \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitSYNC(dwIoBase)                                     \
+#define MACvTransmitSYNC(iobase)                                       \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_SYNCDMACTL, &dwData);            \
+       VNSvInPortD(iobase + MAC_REG_SYNCDMACTL, &dwData);              \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitATIM(dwIoBase)                                     \
+#define MACvTransmitATIM(iobase)                                       \
 do {                                                                   \
        unsigned long dwData;                                           \
-       VNSvInPortD(dwIoBase + MAC_REG_ATIMDMACTL, &dwData);            \
+       VNSvInPortD(iobase + MAC_REG_ATIMDMACTL, &dwData);              \
        if (dwData & DMACTL_RUN)                                        \
-               VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL, DMACTL_WAKE); \
+               VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE); \
        else                                                            \
-               VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL, DMACTL_RUN); \
+               VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN); \
 } while (0)
 
-#define MACvTransmitBCN(dwIoBase)                                      \
-       VNSvOutPortB(dwIoBase + MAC_REG_BCNDMACTL, BEACON_READY)
+#define MACvTransmitBCN(iobase)                                        \
+       VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY)
 
-#define MACvClearStckDS(dwIoBase)                                      \
+#define MACvClearStckDS(iobase)                                        \
 do {                                                                   \
        unsigned char byOrgValue;                                       \
-       VNSvInPortB(dwIoBase + MAC_REG_STICKHW, &byOrgValue);           \
+       VNSvInPortB(iobase + MAC_REG_STICKHW, &byOrgValue);             \
        byOrgValue = byOrgValue & 0xFC;                                 \
-       VNSvOutPortB(dwIoBase + MAC_REG_STICKHW, byOrgValue);           \
+       VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue);             \
 } while (0)
 
-#define MACvReadISR(dwIoBase, pdwValue)                                \
-       VNSvInPortD(dwIoBase + MAC_REG_ISR, pdwValue)
+#define MACvReadISR(iobase, pdwValue)                          \
+       VNSvInPortD(iobase + MAC_REG_ISR, pdwValue)
 
-#define MACvWriteISR(dwIoBase, dwValue)                                \
-       VNSvOutPortD(dwIoBase + MAC_REG_ISR, dwValue)
+#define MACvWriteISR(iobase, dwValue)                          \
+       VNSvOutPortD(iobase + MAC_REG_ISR, dwValue)
 
-#define MACvIntEnable(dwIoBase, dwMask)                                \
-       VNSvOutPortD(dwIoBase + MAC_REG_IMR, dwMask)
+#define MACvIntEnable(iobase, dwMask)                          \
+       VNSvOutPortD(iobase + MAC_REG_IMR, dwMask)
 
-#define MACvIntDisable(dwIoBase)                               \
-       VNSvOutPortD(dwIoBase + MAC_REG_IMR, 0)
+#define MACvIntDisable(iobase)                         \
+       VNSvOutPortD(iobase + MAC_REG_IMR, 0)
 
-#define MACvSelectPage0(dwIoBase)                              \
-               VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0)
+#define MACvSelectPage0(iobase)                                \
+               VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0)
 
-#define MACvSelectPage1(dwIoBase)                              \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1)
+#define MACvSelectPage1(iobase)                                \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1)
 
-#define MACvReadMIBCounter(dwIoBase, pdwCounter)                       \
-       VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter)
+#define MACvReadMIBCounter(iobase, pdwCounter)                 \
+       VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter)
 
-#define MACvPwrEvntDisable(dwIoBase)                                   \
-       VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x0000)
+#define MACvPwrEvntDisable(iobase)                                     \
+       VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000)
 
-#define MACvEnableProtectMD(dwIoBase)                                  \
+#define MACvEnableProtectMD(iobase)                                    \
 do {                                                                   \
        unsigned long dwOrgValue;                                       \
-       VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+       VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
        dwOrgValue = dwOrgValue | EnCFG_ProtectMd;                      \
-       VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+       VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvDisableProtectMD(dwIoBase)                                 \
+#define MACvDisableProtectMD(iobase)                                   \
 do {                                                                   \
        unsigned long dwOrgValue;                                       \
-       VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+       VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
        dwOrgValue = dwOrgValue & ~EnCFG_ProtectMd;                     \
-       VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+       VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvEnableBarkerPreambleMd(dwIoBase)                           \
+#define MACvEnableBarkerPreambleMd(iobase)                             \
 do {                                                                   \
        unsigned long dwOrgValue;                                       \
-       VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+       VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
        dwOrgValue = dwOrgValue | EnCFG_BarkerPream;                    \
-       VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+       VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvDisableBarkerPreambleMd(dwIoBase)                          \
+#define MACvDisableBarkerPreambleMd(iobase)                            \
 do {                                                                   \
        unsigned long dwOrgValue;                                       \
-       VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+       VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
        dwOrgValue = dwOrgValue & ~EnCFG_BarkerPream;                   \
-       VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+       VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvSetBBType(dwIoBase, byTyp)                                 \
+#define MACvSetBBType(iobase, byTyp)                                   \
 do {                                                                   \
        unsigned long dwOrgValue;                                       \
-       VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue);             \
+       VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue);               \
        dwOrgValue = dwOrgValue & ~EnCFG_BBType_MASK;                   \
        dwOrgValue = dwOrgValue | (unsigned long)byTyp;                 \
-       VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue);             \
+       VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue);               \
 } while (0)
 
-#define MACvReadATIMW(dwIoBase, pwCounter)                             \
-       VNSvInPortW(dwIoBase + MAC_REG_AIDATIM, pwCounter)
+#define MACvReadATIMW(iobase, pwCounter)                               \
+       VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter)
 
-#define MACvWriteATIMW(dwIoBase, wCounter)                             \
-       VNSvOutPortW(dwIoBase + MAC_REG_AIDATIM, wCounter)
+#define MACvWriteATIMW(iobase, wCounter)                               \
+       VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter)
 
-#define MACvWriteCRC16_128(dwIoBase, byRegOfs, wCRC)           \
+#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC)             \
 do {                                                           \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1);           \
-       VNSvOutPortW(dwIoBase + byRegOfs, wCRC);                \
-       VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 0);           \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);             \
+       VNSvOutPortW(iobase + byRegOfs, wCRC);          \
+       VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);             \
 } while (0)
 
-#define MACvGPIOIn(dwIoBase, pbyValue)                                 \
-       VNSvInPortB(dwIoBase + MAC_REG_GPIOCTL1, pbyValue)
+#define MACvGPIOIn(iobase, pbyValue)                                   \
+       VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue)
 
-#define MACvSetRFLE_LatchBase(dwIoBase)                                 \
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
+#define MACvSetRFLE_LatchBase(iobase)                                 \
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
 
 bool MACbIsRegBitsOn(struct vnt_private *, unsigned char byRegOfs,
                     unsigned char byTestBits);

diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index 1762c05..431a5d4 100644 (file)
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -405,7 +405,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -414,16 +414,16 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  */
 static bool s_bAL7230Init(struct vnt_private *priv)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        int     ii;
        bool ret;
 
        ret = true;
 
        /* 3-wire control for normal mode */
-       VNSvOutPortB(dwIoBase + MAC_REG_SOFTPWRCTL, 0);
+       VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0);
 
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
        BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value for Calibration */
 
@@ -431,7 +431,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
                ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]);
 
        /* PLL On */
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
        /* Calibration */
        MACvTimer0MicroSDelay(priv, 150);/* 150us */
@@ -444,7 +444,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
        /* TXDCOC:disable, RCK:disable */
        ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);
 
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
                                                         SOFTPWRCTL_SWPE2    |
                                                         SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
@@ -453,7 +453,7 @@ static bool s_bAL7230Init(struct vnt_private *priv)
 
        /* PE1: TX_ON, PE2: RX_ON, PE3: PLLON */
        /* 3-wire control for power saving mode */
-       VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
+       VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
 
        return ret;
 }
@@ -463,26 +463,26 @@ static bool s_bAL7230Init(struct vnt_private *priv)
  */
 static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byChannel)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        bool ret;
 
        ret = true;
 
        /* PLLON Off */
-       MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+       MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
        ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable0[byChannel - 1]);
        ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable1[byChannel - 1]);
        ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable2[byChannel - 1]);
 
        /* PLLOn On */
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
        /* Set Channel[7] = 0 to tell H/W channel is changing now. */
-       VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel & 0x7F));
+       VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F));
        MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL7230);
        /* Set Channel[7] = 1 to tell H/W channel change is done. */
-       VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel | 0x80));
+       VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80));
 
        return ret;
 }
@@ -492,7 +492,7 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      dwData      - data to write
  *  Out:
  *      none
@@ -502,15 +502,15 @@ static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned char byCha
  */
 bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        unsigned short ww;
        unsigned long dwValue;
 
-       VNSvOutPortD(dwIoBase + MAC_REG_IFREGCTL, dwData);
+       VNSvOutPortD(iobase + MAC_REG_IFREGCTL, dwData);
 
        /* W_MAX_TIMEOUT is the timeout period */
        for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
-               VNSvInPortD(dwIoBase + MAC_REG_IFREGCTL, &dwValue);
+               VNSvInPortD(iobase + MAC_REG_IFREGCTL, &dwValue);
                if (dwValue & IFREGCTL_DONE)
                        break;
        }
@@ -526,7 +526,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *  Out:
  *      none
  *
@@ -535,19 +535,19 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
  */
 static bool RFbAL2230Init(struct vnt_private *priv)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        int     ii;
        bool ret;
 
        ret = true;
 
        /* 3-wire control for normal mode */
-       VNSvOutPortB(dwIoBase + MAC_REG_SOFTPWRCTL, 0);
+       VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0);
 
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
        /* PLL  Off */
-       MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+       MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
        /* patch abnormal AL2230 frequency output */
        IFRFbWriteEmbedded(priv, (0x07168700 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
@@ -557,7 +557,7 @@ static bool RFbAL2230Init(struct vnt_private *priv)
        MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */
 
        /* PLL On */
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
 
        MACvTimer0MicroSDelay(priv, 150);/* 150us */
        ret &= IFRFbWriteEmbedded(priv, (0x00d80f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW));
@@ -566,20 +566,20 @@ static bool RFbAL2230Init(struct vnt_private *priv)
        MACvTimer0MicroSDelay(priv, 30);/* 30us */
        ret &= IFRFbWriteEmbedded(priv, dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);
 
-       MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
+       MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |
                                                         SOFTPWRCTL_SWPE2    |
                                                         SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
 
        /* 3-wire control for power saving mode */
-       VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
+       VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 1100 0000 */
 
        return ret;
 }
 
 static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byChannel)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        bool ret;
 
        ret = true;
@@ -588,10 +588,10 @@ static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned char byCha
        ret &= IFRFbWriteEmbedded(priv, dwAL2230ChannelTable1[byChannel - 1]);
 
        /* Set Channel[7] = 0 to tell H/W channel is changing now. */
-       VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel & 0x7F));
+       VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F));
        MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL2230);
        /* Set Channel[7] = 1 to tell H/W channel change is done. */
-       VNSvOutPortB(dwIoBase + MAC_REG_CHANNEL, (byChannel | 0x80));
+       VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80));
 
        return ret;
 }
@@ -676,7 +676,7 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase      - I/O base address
  *      uChannel    - channel number
  *      bySleepCnt  - SleepProgSyn count
  *
@@ -686,12 +686,12 @@ bool RFbSelectChannel(struct vnt_private *priv, unsigned char byRFType,
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,
                         u16 uChannel)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
+       void __iomem *iobase = priv->PortOffset;
        int   ii;
        unsigned char byInitCount = 0;
        unsigned char bySleepCount = 0;
 
-       VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, 0);
+       VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0);
        switch (byRFType) {
        case RF_AIROHA:
        case RF_AL2230S:
@@ -753,7 +753,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char byRFType,
  *
  * Parameters:
  *  In:
- *      dwIoBase       - I/O base address
+ *      iobase         - I/O base address
  *      dwRFPowerTable - RF Tx Power Setting
  *  Out:
  *      none
@@ -825,7 +825,7 @@ bool RFbSetPower(
  *
  * Parameters:
  *  In:
- *      dwIoBase       - I/O base address
+ *      iobase         - I/O base address
  *      dwRFPowerTable - RF Tx Power Setting
  *  Out:
  *      none

diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c
index e6d1280..635f271 100644 (file)
--- a/drivers/staging/vt6655/srom.c
+++ b/drivers/staging/vt6655/srom.c
@@ -60,7 +60,7 @@
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *      byContntOffset  - address of EEPROM
  *  Out:
  *      none
@@ -68,7 +68,7 @@
  * Return Value: data read
  *
  */
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
                                 unsigned char byContntOffset)
 {
        unsigned short wDelay, wNoACK;
@@ -77,18 +77,18 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
        unsigned char byOrg;
 
        byData = 0xFF;
-       VNSvInPortB(dwIoBase + MAC_REG_I2MCFG, &byOrg);
+       VNSvInPortB(iobase + MAC_REG_I2MCFG, &byOrg);
        /* turn off hardware retry for getting NACK */
-       VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY)));
+       VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY)));
        for (wNoACK = 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) {
-               VNSvOutPortB(dwIoBase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID);
-               VNSvOutPortB(dwIoBase + MAC_REG_I2MTGAD, byContntOffset);
+               VNSvOutPortB(iobase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID);
+               VNSvOutPortB(iobase + MAC_REG_I2MTGAD, byContntOffset);
 
                /* issue read command */
-               VNSvOutPortB(dwIoBase + MAC_REG_I2MCSR, I2MCSR_EEMR);
+               VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR);
                /* wait DONE be set */
                for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) {
-                       VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait);
+                       VNSvInPortB(iobase + MAC_REG_I2MCSR, &byWait);
                        if (byWait & (I2MCSR_DONE | I2MCSR_NACK))
                                break;
                        PCAvDelayByIO(CB_DELAY_LOOP_WAIT);
@@ -98,8 +98,8 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
                        break;
                }
        }
-       VNSvInPortB(dwIoBase + MAC_REG_I2MDIPT, &byData);
-       VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, byOrg);
+       VNSvInPortB(iobase + MAC_REG_I2MDIPT, &byData);
+       VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg);
        return byData;
 }
 
@@ -108,20 +108,20 @@ unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *  Out:
  *      pbyEepromRegs   - EEPROM content Buffer
  *
  * Return Value: none
  *
  */
-void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs)
+void SROMvReadAllContents(void __iomem *iobase, unsigned char *pbyEepromRegs)
 {
        int     ii;
 
        /* ii = Rom Address */
        for (ii = 0; ii < EEP_MAX_CONTEXT_SIZE; ii++) {
-               *pbyEepromRegs = SROMbyReadEmbedded(dwIoBase,
+               *pbyEepromRegs = SROMbyReadEmbedded(iobase,
                                                    (unsigned char)ii);
                pbyEepromRegs++;
        }
@@ -132,21 +132,21 @@ void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase          - I/O base address
  *  Out:
  *      pbyEtherAddress - Ethernet Address buffer
  *
  * Return Value: none
  *
  */
-void SROMvReadEtherAddress(void __iomem *dwIoBase,
+void SROMvReadEtherAddress(void __iomem *iobase,
                           unsigned char *pbyEtherAddress)
 {
        unsigned char ii;
 
        /* ii = Rom Address */
        for (ii = 0; ii < ETH_ALEN; ii++) {
-               *pbyEtherAddress = SROMbyReadEmbedded(dwIoBase, ii);
+               *pbyEtherAddress = SROMbyReadEmbedded(iobase, ii);
                pbyEtherAddress++;
        }
 }

diff --git a/drivers/staging/vt6655/srom.h b/drivers/staging/vt6655/srom.h
index b3215a2..6e03ab6 100644 (file)
--- a/drivers/staging/vt6655/srom.h
+++ b/drivers/staging/vt6655/srom.h
@@ -85,12 +85,12 @@
 
 /*---------------------  Export Functions  --------------------------*/
 
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
                                 unsigned char byContntOffset);
 
-void SROMvReadAllContents(void __iomem *dwIoBase, unsigned char *pbyEepromRegs);
+void SROMvReadAllContents(void __iomem *iobase, unsigned char *pbyEepromRegs);
 
-void SROMvReadEtherAddress(void __iomem *dwIoBase,
+void SROMvReadEtherAddress(void __iomem *iobase,
                           unsigned char *pbyEtherAddress);
 
 #endif /* __EEPROM_H__*/