Skip to contentSkip to conversation

Staging: vt6655: Replace dwIoBase by iobase

PATCH In review Varsha Rao 2 participants 6 messages Oct 8, 2016 – Oct 9, 2016 Staging

lore
Share & tools
lore

Varsha Rao

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/staging/vt6655/baseband.c |  52 +++---
 drivers/staging/vt6655/baseband.h |   8 +-
 drivers/staging/vt6655/card.c     |  30 ++--
 drivers/staging/vt6655/mac.h      | 322 +++++++++++++++++++-------------------
 drivers/staging/vt6655/rf.c       |  64 ++++----
 drivers/staging/vt6655/srom.c     |  32 ++--
 drivers/staging/vt6655/srom.h     |   6 +-
 7 files changed, 257 insertions(+), 257 deletions(-)
drivers/staging/vt6655/baseband.c +26 -26
index de503a3..e739ecc 100644
@@ -1916,7 +1916,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

@@ -1927,24 +1927,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");

@@ -1958,7 +1958,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:

@@ -1970,20 +1970,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;
 	}

@@ -2000,7 +2000,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:

@@ -2014,7 +2014,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;
 

@@ -2036,8 +2036,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;

@@ -2076,8 +2076,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;

@@ -2098,7 +2098,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,

@@ -2106,7 +2106,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);
 

@@ -2154,7 +2154,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++)

@@ -2167,11 +2167,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);
 		/* }} */

@@ -2259,7 +2259,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -2280,7 +2280,7 @@ BBvSoftwareReset(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -2302,7 +2302,7 @@ BBvPowerSaveModeON(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *
drivers/staging/vt6655/baseband.h +4 -4
index a732fba..1d1d4fc 100644
@@ -58,11 +58,11 @@
 #define TOP_RATE_2M         0x00200000
 #define TOP_RATE_1M         0x00100000
 
-#define bbvclearfoe(dwIoBase)				\
-	BBbWriteEmbedded(dwIoBase, 0xB1, 0)
+#define bbvclearfoe(iobase)				\
+	BBbWriteEmbedded(iobase, 0xB1, 0)
 
-#define BBvSetFOE(dwIoBase)				\
-	BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C)
+#define BBvSetFOE(iobase)				\
+	BBbWriteEmbedded(iobase, 0xB1, 0x0C)
 
 unsigned int
 BBuGetFrameTime(
drivers/staging/vt6655/card.c +15 -15
index dbcea44..03790bb 100644
@@ -36,7 +36,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().
  *
  */

@@ -938,20 +938,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;
 }

@@ -989,7 +989,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - IO Base
+ *      iobase        - IO Base
  *      wBeaconInterval - Beacon Interval
  *  Out:
  *      none

@@ -999,16 +999,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);
 }
 
 /*

@@ -1028,12 +1028,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);
 }
drivers/staging/vt6655/mac.h +161 -161

502 lines not on this page · raw message

drivers/staging/vt6655/rf.c +32 -32

220 lines not on this page · raw message

drivers/staging/vt6655/srom.c +16 -16
index ee99277..0b612d3 100644
@@ -64,7 +64,7 @@
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase        - I/O base address
  *      byContntOffset  - address of EEPROM
  *  Out:
  *      none

@@ -72,7 +72,7 @@
  * Return Value: data read
  *
  */
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
 				 unsigned char byContntOffset)
 {
 	unsigned short wDelay, wNoACK;

@@ -81,18 +81,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);

@@ -102,8 +102,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;
 }
 

@@ -112,20 +112,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++;
 	}

@@ -136,21 +136,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++;
 	}
 }
drivers/staging/vt6655/srom.h +3 -3
index 531bf00..3087d56 100644
@@ -90,12 +90,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__*/
Signature · 1 line
2.7.4
#1 lore raw
Quoted 1 line · Varsha Rao

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

Put at least one space after a period. Limit the commit message line length to around 70 characters.

Quoted 17 lines
Signed-off-by Varsha Rao <[email protected]>
---
 drivers/staging/vt6655/baseband.c |  52 +++---
 drivers/staging/vt6655/baseband.h |   8 +-
 drivers/staging/vt6655/card.c     |  30 ++--
 drivers/staging/vt6655/mac.h      | 322 +++++++++++++++++++-------------------
 drivers/staging/vt6655/rf.c       |  64 ++++----
 drivers/staging/vt6655/srom.c     |  32 ++--
 drivers/staging/vt6655/srom.h     |   6 +-
 7 files changed, 257 insertions(+), 257 deletions(-)
drivers/staging/vt6655/baseband.c +0 -0
index de503a3..e739ecc 100644

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, · line 1919

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
@@ -1916,7 +1916,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

You should preserve the alignment of the different comments.

julia

Quoted 1,167 lines
drivers/staging/vt6655/baseband.c +25 -25
  *      byBBAddr    - address of register in Baseband
  *  Out:
  *      pbyData     - data read

@@ -1927,24 +1927,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");

@@ -1958,7 +1958,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:

@@ -1970,20 +1970,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;
 	}

@@ -2000,7 +2000,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:

@@ -2014,7 +2014,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;
 

@@ -2036,8 +2036,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;

@@ -2076,8 +2076,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;

@@ -2098,7 +2098,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,

@@ -2106,7 +2106,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);
 

@@ -2154,7 +2154,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++)

@@ -2167,11 +2167,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);
 		/* }} */

@@ -2259,7 +2259,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -2280,7 +2280,7 @@ BBvSoftwareReset(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -2302,7 +2302,7 @@ BBvPowerSaveModeON(struct vnt_private *priv)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *
drivers/staging/vt6655/baseband.h +4 -4
index a732fba..1d1d4fc 100644
@@ -58,11 +58,11 @@
 #define TOP_RATE_2M         0x00200000
 #define TOP_RATE_1M         0x00100000
 
-#define bbvclearfoe(dwIoBase)				\
-	BBbWriteEmbedded(dwIoBase, 0xB1, 0)
+#define bbvclearfoe(iobase)				\
+	BBbWriteEmbedded(iobase, 0xB1, 0)
 
-#define BBvSetFOE(dwIoBase)				\
-	BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C)
+#define BBvSetFOE(iobase)				\
+	BBbWriteEmbedded(iobase, 0xB1, 0x0C)
 
 unsigned int
 BBuGetFrameTime(
drivers/staging/vt6655/card.c +15 -15
index dbcea44..03790bb 100644
@@ -36,7 +36,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().
  *
  */

@@ -938,20 +938,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;
 }

@@ -989,7 +989,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
  *
  * Parameters:
  *  In:
- *      dwIoBase        - IO Base
+ *      iobase        - IO Base
  *      wBeaconInterval - Beacon Interval
  *  Out:
  *      none

@@ -999,16 +999,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);
 }
 
 /*

@@ -1028,12 +1028,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);
 }
drivers/staging/vt6655/mac.h +161 -161
index 030f529..4d8b748 100644
@@ -554,341 +554,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);
drivers/staging/vt6655/rf.c +32 -32
index 447882c..92bb1c6 100644
@@ -410,7 +410,7 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -419,16 +419,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 */
 

@@ -436,7 +436,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 */

@@ -449,7 +449,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));

@@ -458,7 +458,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;
 }

@@ -468,26 +468,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;
 }

@@ -497,7 +497,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

@@ -507,15 +507,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;
 	}

@@ -531,7 +531,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)
  *
  * Parameters:
  *  In:
- *      dwIoBase    - I/O base address
+ *      iobase    - I/O base address
  *  Out:
  *      none
  *

@@ -540,19 +540,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));

@@ -562,7 +562,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));

@@ -571,20 +571,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;

@@ -593,10 +593,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;
 }

@@ -681,7 +681,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
  *

@@ -691,12 +691,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:

@@ -758,7 +758,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

@@ -830,7 +830,7 @@ bool RFbSetPower(
  *
  * Parameters:
  *  In:
- *      dwIoBase       - I/O base address
+ *      iobase       - I/O base address
  *      dwRFPowerTable - RF Tx Power Setting
  *  Out:
  *      none
drivers/staging/vt6655/srom.c +16 -16
index ee99277..0b612d3 100644
@@ -64,7 +64,7 @@
  *
  * Parameters:
  *  In:
- *      dwIoBase        - I/O base address
+ *      iobase        - I/O base address
  *      byContntOffset  - address of EEPROM
  *  Out:
  *      none

@@ -72,7 +72,7 @@
  * Return Value: data read
  *
  */
-unsigned char SROMbyReadEmbedded(void __iomem *dwIoBase,
+unsigned char SROMbyReadEmbedded(void __iomem *iobase,
 				 unsigned char byContntOffset)
 {
 	unsigned short wDelay, wNoACK;

@@ -81,18 +81,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);

@@ -102,8 +102,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;
 }
 

@@ -112,20 +112,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++;
 	}

@@ -136,21 +136,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++;
 	}
 }
drivers/staging/vt6655/srom.h +3 -4
index 531bf00..3087d56 100644
@@ -90,12 +90,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__*/
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20161008165532.GA26251%40euri.
For more options, visit https://groups.google.com/d/optout.

author
#2 lore raw

I will make the changes.Thanks for your reply.

Quoted 1,377 lines · Julia Lawall
Quoted 1 line · Varsha Rao

In this patch dwIoBase is renamed as iobase.This is done to fix the

checkpatch issue of CamelCase.

Put at least one space after a period. Limit the commit message line length to around 70 characters.

Quoted 7 lines
Signed-off-by Varsha Rao <[email protected] <javascript:>>

---

 drivers/staging/vt6655/baseband.c |  52 +++--- 
 drivers/staging/vt6655/baseband.h |   8 +- 
 drivers/staging/vt6655/card.c     |  30 ++-- 
 drivers/staging/vt6655/mac.h      | 322

+++++++++++++++++++-------------------

Review

Quoted 6 lines
 drivers/staging/vt6655/rf.c       |  64 ++++---- 
 drivers/staging/vt6655/srom.c     |  32 ++-- 
 drivers/staging/vt6655/srom.h     |   6 +- 
 7 files changed, 257 insertions(+), 257 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.c

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines

index de503a3..e739ecc 100644

drivers/staging/vt6655/baseband.c +0 -0
@@ -1916,7 +1916,7 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, · line 1919

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address

You should preserve the alignment of the different comments.

julia

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines
drivers/staging/vt6655/baseband.c +0 -0
  *      byBBAddr    - address of register in Baseband 
  *  Out: 
  *      pbyData     - data read 

@@ -1927,24 +1927,24 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

Quoted 83 lines
drivers/staging/vt6655/baseband.c +13 -13
 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"); 

@@ -1958,7 +1958,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: 

@@ -1970,20 +1970,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; 
         } 

@@ -2000,7 +2000,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: 

@@ -2014,7 +2014,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2036

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2036,8 +2036,8 @@ bool BBbVT3253Init(struct vnt_private *priv) 
 

                                         byVT3253B0_AGC4_RFMD2959[ii][0],
Quoted 1 line
                                         byVT3253B0_AGC4_RFMD2959[ii][1]);
Quoted 2 lines

- VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET,

0x23);

Quoted 1 line

- MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY,

BIT(0));

drivers/staging/vt6655/baseband.c

Quoted 2 lines
drivers/staging/vt6655/baseband.c +2 -0
+                        VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); 
+                        MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY,

BIT(0));

Quoted 15 lines
                 } 
                 priv->abyBBVGA[0] = 0x18; 
                 priv->abyBBVGA[1] = 0x0A;
drivers/staging/vt6655/baseband.c +2 -2
@@ -2076,8 +2076,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2098

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2098,7 +2098,7 @@ bool BBbVT3253Init(struct vnt_private *priv) 
                  * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B

inverted)

Quoted 17 lines
drivers/staging/vt6655/baseband.c +2 -2
                  */ 
 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/ 
 
                 /* Init ANT B select, 
                  * RX Config CR10 = 0x28->0x2A, 

@@ -2106,7 +2106,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);

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2160

Quoted 8 lines
drivers/staging/vt6655/baseband.c +1 -1
@@ -2154,7 +2154,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++)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2168

Quoted 3 lines
drivers/staging/vt6655/baseband.c +0 -0
@@ -2167,11 +2167,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)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv)

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*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)

drivers/staging/vt6655/baseband.c void BBvSetVGAGainOffset(struct vnt_private *priv,

Quoted 7 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/ 
                 /* Select VC1/VC2, CR215 = 0x02->0x06 */ 
                 bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06); 
                 /* }} */ 

@@ -2259,7 +2259,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv,

unsigned char byData)

Review

Quoted 27 lines
drivers/staging/vt6655/baseband.c +3 -3
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2280,7 +2280,7 @@ BBvSoftwareReset(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2302,7 +2302,7 @@ BBvPowerSaveModeON(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  *
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.h

Review

Quoted 20 lines

index a732fba..1d1d4fc 100644

drivers/staging/vt6655/baseband.h +4 -4
@@ -58,11 +58,11 @@ 
 #define TOP_RATE_2M         0x00200000 
 #define TOP_RATE_1M         0x00100000 
 
-#define bbvclearfoe(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0) 
+#define bbvclearfoe(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0) 
 
-#define BBvSetFOE(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C) 
+#define BBvSetFOE(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0x0C) 
 
 unsigned int 
 BBuGetFrameTime(
(quoted diff) +0 -0

b/drivers/staging/vt6655/card.c

drivers/staging/vt6655/card.c line 38

Quoted 7 lines

index dbcea44..03790bb 100644

drivers/staging/vt6655/card.c +0 -0
@@ -36,7 +36,7 @@ 
  * 
  * Revision History: 
  *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253

spec.

drivers/staging/vt6655/card.c line 39

Quoted 1 line
drivers/staging/vt6655/card.c +0 -1
- *      08-26-2003 Kyle Hsu:      Modify the defination type of

dwIoBase.

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+ *      08-26-2003 Kyle Hsu:      Modify the defination type of iobase. 
  *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS(). 
  * 
  */ 

@@ -938,20 +938,20 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +2 -2
  */ 
 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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
         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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 · line 954

Quoted 2 lines
drivers/staging/vt6655/card.c +2 -0
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); 
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF +

1);

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 4 lines
drivers/staging/vt6655/card.c +0 -0
         return true; 
 } 

@@ -989,7 +989,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 9 lines
drivers/staging/vt6655/card.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase        - IO Base 
+ *      iobase        - IO Base 
  *      wBeaconInterval - Beacon Interval 
  *  Out: 
  *      none 

@@ -999,16 +999,16 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 8 lines
drivers/staging/vt6655/card.c +1 -1
 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

*/

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 9 lines
drivers/staging/vt6655/card.c +2 -3
         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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
 } 
 
 /* 

@@ -1028,12 +1028,12 @@ void CARDvSetFirstNextTBTT(struct vnt_private

*priv,

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
 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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 3 lines
drivers/staging/vt6655/card.c +2 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >>

32));

drivers/staging/vt6655/mac.h line 557

Quoted 12 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
         pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); 
 }
drivers/staging/vt6655/mac.h +0 -1
index 030f529..4d8b748 100644 
@@ -554,341 +554,341 @@ 
 
 /*---------------------  Export Macros ------------------------------*/ 
 
-#define MACvRegBitsOn(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 557

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOn(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 558

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 559

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOn(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 564

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOn(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 565

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 566

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOn(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 571

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOn(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 572

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 573

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOnEx(dwIoBase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 578

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOnEx(iobase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 579

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 580

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 582

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         byData &=

byMask; \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOff(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 586

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOff(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 587

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 588

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOff(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 593

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOff(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 594

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 595

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOff(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 600

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOff(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 601

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 602

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData &

~(dwBits)); \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData &

~(dwBits)); \

Quoted 74 lines
drivers/staging/vt6655/mac.h +24 -24
 } 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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +2 -4
                     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, \

Quoted 67 lines
drivers/staging/vt6655/mac.h +23 -22
+        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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -3
+        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) \

drivers/staging/vt6655/mac.h line 713

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, IMR_MASK_VALUE) 
+#define

MACvClearISR(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE) 
 
-#define

MACvStart(dwIoBase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h line 716

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvStart(iobase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
                      (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) 
 
-#define

MACvRx0PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 720

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKT) 
+#define

MACvRx0PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) 
 
-#define

MACvRx0BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 723

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
+#define

MACvRx0BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
 
-#define

MACvRx1PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 726

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKT) 
+#define

MACvRx1PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) 
 
-#define

MACvRx1BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 729

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
+#define

MACvRx1BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
 
-#define

MACvRxOn(dwIoBase) \

drivers/staging/vt6655/mac.h line 732

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_RXON) 
+#define

MACvRxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON) 
 
-#define

MACvReceive0(dwIoBase) \

drivers/staging/vt6655/mac.h line 735

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvReceive0(iobase) \

drivers/staging/vt6655/mac.h line 736

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 737

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 739

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         if (dwData &

DMACTL_RUN) \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0,

DMACTL_WAKE); \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvReceive1(dwIoBase) \

Quoted 1 line

+#define

MACvReceive1(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTxOn(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_TXON) 
+#define

MACvTxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON) 
 
-#define

MACvTransmit0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmit0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitAC0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitAC0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitSYNC(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitSYNC(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitATIM(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitATIM(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitBCN(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortB(dwIoBase + MAC_REG_BCNDMACTL, BEACON_READY) 
+#define

MACvTransmitBCN(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) 
 
-#define

MACvClearStckDS(dwIoBase) \

Quoted 1 line

+#define

MACvClearStckDS(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned char

byOrgValue; \

Quoted 1 line

- VNSvInPortB(dwIoBase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

+ VNSvInPortB(iobase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

byOrgValue = byOrgValue &

0xFC; \

Quoted 1 line

- VNSvOutPortB(dwIoBase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadISR(dwIoBase,

pdwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_ISR, pdwValue) 
+#define MACvReadISR(iobase, pdwValue)                                \ 
+        VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) 
 
-#define MACvWriteISR(dwIoBase,

dwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, dwValue) 
+#define MACvWriteISR(iobase, dwValue)                                \ 
+        VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) 
 
-#define MACvIntEnable(dwIoBase,

dwMask) \

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-        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)                                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-                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) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter) 
+#define MACvReadMIBCounter(iobase, pdwCounter)                        \ 
+        VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) 
 
-#define

MACvPwrEvntDisable(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x0000) 
+#define

MACvPwrEvntDisable(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000) 
 
-#define

MACvEnableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvEnableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvDisableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvEnableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvEnableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvDisableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvSetBBType(dwIoBase,

byTyp) \

Quoted 1 line

+#define MACvSetBBType(iobase,

byTyp) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BBType_MASK; \

Quoted 1 line

dwOrgValue = dwOrgValue | (unsigned

long)byTyp; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadATIMW(dwIoBase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortW(dwIoBase + MAC_REG_AIDATIM, pwCounter) 
+#define MACvReadATIMW(iobase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter) 
 
-#define MACvWriteATIMW(dwIoBase,

wCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_AIDATIM, wCounter) 
+#define MACvWriteATIMW(iobase,

wCounter) \

Quoted 4 lines
drivers/staging/vt6655/mac.h +2 -1
+        VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter) 
 
-#define MACvWriteCRC16_128(dwIoBase, byRegOfs, wCRC)                \ 
+#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC)                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -4
 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) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortB(dwIoBase + MAC_REG_GPIOCTL1, pbyValue) 
+#define MACvGPIOIn(iobase,

pbyValue) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) 
 
-#define MACvSetRFLE_LatchBase(dwIoBase)

\

Quoted 1 line

- MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +2 -0
+#define MACvSetRFLE_LatchBase(iobase)                                 \ 
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 8 lines

bool MACbIsRegBitsOn(struct vnt_private *, unsigned char byRegOfs,

                      unsigned char byTestBits);
drivers/staging/vt6655/rf.c +0 -0
index 447882c..92bb1c6 100644 
@@ -410,7 +410,7 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -419,16 +419,16 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool s_bAL7230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c static const unsigned long · line 431

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 1 line

BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value

for Calibration */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -436,7 +436,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
                 ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]); 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 450

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -0
         /* Calibration */ 
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 

@@ -449,7 +449,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
         /* TXDCOC:disable, RCK:disable */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -458,7 +458,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 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private

Quoted 4 lines
drivers/staging/vt6655/rf.c +0 -0
         return ret; 
 } 

@@ -468,26 +468,26 @@ static bool s_bAL7230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 469

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
  */ 
 static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv)

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -2
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 
 
         /* PLLON Off */ 
-        MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 477

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 478

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable0[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 479

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 480

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable2[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -1
         /* PLLOn On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -497,7 +497,7 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      dwData      - data to write 
  *  Out: 
  *      none 

@@ -507,15 +507,15 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 19 lines
drivers/staging/vt6655/rf.c +3 -3
  */ 
 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; 
         } 

@@ -531,7 +531,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -540,19 +540,19 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool RFbAL2230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, · line 552

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 2 lines
         /* PLL  Off */

- MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 1 line

+ MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 3 lines
         /* patch abnormal AL2230 frequency output */ 
         IFRFbWriteEmbedded(priv,

(0x07168700+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -562,7 +562,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) 
         MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */ 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 567

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 
         ret &= IFRFbWriteEmbedded(priv,

(0x00d80f00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
@@ -571,20 +571,20 @@ static bool RFbAL2230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 572

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 30);/* 30us */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 3 lines
         /* 3-wire control for power saving mode */

- VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 5 lines
         return ret;

}

static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct

Quoted 7 lines

{

drivers/staging/vt6655/rf.c +1 -1
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 

@@ -593,10 +593,10 @@ static bool RFbAL2230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct · line 593

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL2230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -681,7 +681,7 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      uChannel    - channel number 
  *      bySleepCnt  - SleepProgSyn count 
  * 

@@ -691,12 +691,12 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv, · line 691

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char

byRFType,

drivers/staging/vt6655/rf.c bool RFvWriteWakeProgSyn(struct vnt_private *priv,

Quoted 14 lines
drivers/staging/vt6655/rf.c +2 -2
                          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: 

@@ -758,7 +758,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv,

unsigned char byRFType,

Review

Quoted 18 lines
drivers/staging/vt6655/rf.c +2 -2
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none 

@@ -830,7 +830,7 @@ bool RFbSetPower( 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none
(quoted diff) +0 -0

b/drivers/staging/vt6655/srom.c

Quoted 2 lines

index ee99277..0b612d3 100644
--- a/drivers/staging/vt6655/s...

Quoted 1,377 lines · Julia Lawall
Quoted 1 line · Varsha Rao

In this patch dwIoBase is renamed as iobase.This is done to fix the

checkpatch issue of CamelCase.

Put at least one space after a period. Limit the commit message line length to around 70 characters.

Quoted 7 lines
Signed-off-by Varsha Rao <[email protected] <javascript:>>

---

 drivers/staging/vt6655/baseband.c |  52 +++--- 
 drivers/staging/vt6655/baseband.h |   8 +- 
 drivers/staging/vt6655/card.c     |  30 ++-- 
 drivers/staging/vt6655/mac.h      | 322

+++++++++++++++++++-------------------

Review

Quoted 6 lines
 drivers/staging/vt6655/rf.c       |  64 ++++---- 
 drivers/staging/vt6655/srom.c     |  32 ++-- 
 drivers/staging/vt6655/srom.h     |   6 +- 
 7 files changed, 257 insertions(+), 257 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.c

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines

index de503a3..e739ecc 100644

drivers/staging/vt6655/baseband.c +0 -0
@@ -1916,7 +1916,7 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, · line 1919

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address

You should preserve the alignment of the different comments.

julia

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines
drivers/staging/vt6655/baseband.c +0 -0
  *      byBBAddr    - address of register in Baseband 
  *  Out: 
  *      pbyData     - data read 

@@ -1927,24 +1927,24 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

Quoted 83 lines
drivers/staging/vt6655/baseband.c +13 -13
 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"); 

@@ -1958,7 +1958,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: 

@@ -1970,20 +1970,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; 
         } 

@@ -2000,7 +2000,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: 

@@ -2014,7 +2014,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2036

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2036,8 +2036,8 @@ bool BBbVT3253Init(struct vnt_private *priv) 
 

                                         byVT3253B0_AGC4_RFMD2959[ii][0],
Quoted 1 line
                                         byVT3253B0_AGC4_RFMD2959[ii][1]);
Quoted 2 lines

- VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET,

0x23);

Quoted 1 line

- MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY,

BIT(0));

drivers/staging/vt6655/baseband.c

Quoted 2 lines
drivers/staging/vt6655/baseband.c +2 -0
+                        VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); 
+                        MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY,

BIT(0));

Quoted 15 lines
                 } 
                 priv->abyBBVGA[0] = 0x18; 
                 priv->abyBBVGA[1] = 0x0A;
drivers/staging/vt6655/baseband.c +2 -2
@@ -2076,8 +2076,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2098

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2098,7 +2098,7 @@ bool BBbVT3253Init(struct vnt_private *priv) 
                  * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B

inverted)

Quoted 17 lines
drivers/staging/vt6655/baseband.c +2 -2
                  */ 
 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/ 
 
                 /* Init ANT B select, 
                  * RX Config CR10 = 0x28->0x2A, 

@@ -2106,7 +2106,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);

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2160

Quoted 8 lines
drivers/staging/vt6655/baseband.c +1 -1
@@ -2154,7 +2154,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++)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2168

Quoted 3 lines
drivers/staging/vt6655/baseband.c +0 -0
@@ -2167,11 +2167,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)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv)

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*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)

drivers/staging/vt6655/baseband.c void BBvSetVGAGainOffset(struct vnt_private *priv,

Quoted 7 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/ 
                 /* Select VC1/VC2, CR215 = 0x02->0x06 */ 
                 bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06); 
                 /* }} */ 

@@ -2259,7 +2259,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv,

unsigned char byData)

Review

Quoted 27 lines
drivers/staging/vt6655/baseband.c +3 -3
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2280,7 +2280,7 @@ BBvSoftwareReset(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2302,7 +2302,7 @@ BBvPowerSaveModeON(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  *
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.h

Review

Quoted 20 lines

index a732fba..1d1d4fc 100644

drivers/staging/vt6655/baseband.h +4 -4
@@ -58,11 +58,11 @@ 
 #define TOP_RATE_2M         0x00200000 
 #define TOP_RATE_1M         0x00100000 
 
-#define bbvclearfoe(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0) 
+#define bbvclearfoe(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0) 
 
-#define BBvSetFOE(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C) 
+#define BBvSetFOE(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0x0C) 
 
 unsigned int 
 BBuGetFrameTime(
(quoted diff) +0 -0

b/drivers/staging/vt6655/card.c

drivers/staging/vt6655/card.c line 38

Quoted 7 lines

index dbcea44..03790bb 100644

drivers/staging/vt6655/card.c +0 -0
@@ -36,7 +36,7 @@ 
  * 
  * Revision History: 
  *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253

spec.

drivers/staging/vt6655/card.c line 39

Quoted 1 line
drivers/staging/vt6655/card.c +0 -1
- *      08-26-2003 Kyle Hsu:      Modify the defination type of

dwIoBase.

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+ *      08-26-2003 Kyle Hsu:      Modify the defination type of iobase. 
  *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS(). 
  * 
  */ 

@@ -938,20 +938,20 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +2 -2
  */ 
 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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
         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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 · line 954

Quoted 2 lines
drivers/staging/vt6655/card.c +2 -0
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); 
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF +

1);

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 4 lines
drivers/staging/vt6655/card.c +0 -0
         return true; 
 } 

@@ -989,7 +989,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 9 lines
drivers/staging/vt6655/card.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase        - IO Base 
+ *      iobase        - IO Base 
  *      wBeaconInterval - Beacon Interval 
  *  Out: 
  *      none 

@@ -999,16 +999,16 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 8 lines
drivers/staging/vt6655/card.c +1 -1
 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

*/

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 9 lines
drivers/staging/vt6655/card.c +2 -3
         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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
 } 
 
 /* 

@@ -1028,12 +1028,12 @@ void CARDvSetFirstNextTBTT(struct vnt_private

*priv,

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
 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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 3 lines
drivers/staging/vt6655/card.c +2 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >>

32));

drivers/staging/vt6655/mac.h line 557

Quoted 12 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
         pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); 
 }
drivers/staging/vt6655/mac.h +0 -1
index 030f529..4d8b748 100644 
@@ -554,341 +554,341 @@ 
 
 /*---------------------  Export Macros ------------------------------*/ 
 
-#define MACvRegBitsOn(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 557

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOn(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 558

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 559

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOn(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 564

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOn(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 565

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 566

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOn(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 571

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOn(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 572

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 573

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOnEx(dwIoBase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 578

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOnEx(iobase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 579

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 580

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 582

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         byData &=

byMask; \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOff(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 586

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOff(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 587

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 588

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOff(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 593

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOff(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 594

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 595

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOff(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 600

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOff(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 601

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 602

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData &

~(dwBits)); \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData &

~(dwBits)); \

Quoted 74 lines
drivers/staging/vt6655/mac.h +24 -24
 } 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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +2 -4
                     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, \

Quoted 67 lines
drivers/staging/vt6655/mac.h +23 -22
+        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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -3
+        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) \

drivers/staging/vt6655/mac.h line 713

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, IMR_MASK_VALUE) 
+#define

MACvClearISR(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE) 
 
-#define

MACvStart(dwIoBase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h line 716

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvStart(iobase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
                      (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) 
 
-#define

MACvRx0PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 720

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKT) 
+#define

MACvRx0PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) 
 
-#define

MACvRx0BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 723

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
+#define

MACvRx0BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
 
-#define

MACvRx1PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 726

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKT) 
+#define

MACvRx1PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) 
 
-#define

MACvRx1BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 729

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
+#define

MACvRx1BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
 
-#define

MACvRxOn(dwIoBase) \

drivers/staging/vt6655/mac.h line 732

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_RXON) 
+#define

MACvRxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON) 
 
-#define

MACvReceive0(dwIoBase) \

drivers/staging/vt6655/mac.h line 735

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvReceive0(iobase) \

drivers/staging/vt6655/mac.h line 736

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 737

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 739

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         if (dwData &

DMACTL_RUN) \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0,

DMACTL_WAKE); \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvReceive1(dwIoBase) \

Quoted 1 line

+#define

MACvReceive1(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTxOn(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_TXON) 
+#define

MACvTxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON) 
 
-#define

MACvTransmit0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmit0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitAC0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitAC0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitSYNC(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitSYNC(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitATIM(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitATIM(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitBCN(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortB(dwIoBase + MAC_REG_BCNDMACTL, BEACON_READY) 
+#define

MACvTransmitBCN(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) 
 
-#define

MACvClearStckDS(dwIoBase) \

Quoted 1 line

+#define

MACvClearStckDS(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned char

byOrgValue; \

Quoted 1 line

- VNSvInPortB(dwIoBase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

+ VNSvInPortB(iobase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

byOrgValue = byOrgValue &

0xFC; \

Quoted 1 line

- VNSvOutPortB(dwIoBase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadISR(dwIoBase,

pdwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_ISR, pdwValue) 
+#define MACvReadISR(iobase, pdwValue)                                \ 
+        VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) 
 
-#define MACvWriteISR(dwIoBase,

dwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, dwValue) 
+#define MACvWriteISR(iobase, dwValue)                                \ 
+        VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) 
 
-#define MACvIntEnable(dwIoBase,

dwMask) \

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-        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)                                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-                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) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter) 
+#define MACvReadMIBCounter(iobase, pdwCounter)                        \ 
+        VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) 
 
-#define

MACvPwrEvntDisable(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x0000) 
+#define

MACvPwrEvntDisable(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000) 
 
-#define

MACvEnableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvEnableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvDisableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvEnableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvEnableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvDisableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvSetBBType(dwIoBase,

byTyp) \

Quoted 1 line

+#define MACvSetBBType(iobase,

byTyp) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BBType_MASK; \

Quoted 1 line

dwOrgValue = dwOrgValue | (unsigned

long)byTyp; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadATIMW(dwIoBase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortW(dwIoBase + MAC_REG_AIDATIM, pwCounter) 
+#define MACvReadATIMW(iobase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter) 
 
-#define MACvWriteATIMW(dwIoBase,

wCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_AIDATIM, wCounter) 
+#define MACvWriteATIMW(iobase,

wCounter) \

Quoted 4 lines
drivers/staging/vt6655/mac.h +2 -1
+        VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter) 
 
-#define MACvWriteCRC16_128(dwIoBase, byRegOfs, wCRC)                \ 
+#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC)                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -4
 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) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortB(dwIoBase + MAC_REG_GPIOCTL1, pbyValue) 
+#define MACvGPIOIn(iobase,

pbyValue) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) 
 
-#define MACvSetRFLE_LatchBase(dwIoBase)

\

Quoted 1 line

- MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +2 -0
+#define MACvSetRFLE_LatchBase(iobase)                                 \ 
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 8 lines

bool MACbIsRegBitsOn(struct vnt_private *, unsigned char byRegOfs,

                      unsigned char byTestBits);
drivers/staging/vt6655/rf.c +0 -0
index 447882c..92bb1c6 100644 
@@ -410,7 +410,7 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -419,16 +419,16 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool s_bAL7230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c static const unsigned long · line 431

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 1 line

BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value

for Calibration */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -436,7 +436,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
                 ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]); 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 450

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -0
         /* Calibration */ 
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 

@@ -449,7 +449,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
         /* TXDCOC:disable, RCK:disable */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -458,7 +458,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 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private

Quoted 4 lines
drivers/staging/vt6655/rf.c +0 -0
         return ret; 
 } 

@@ -468,26 +468,26 @@ static bool s_bAL7230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 469

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
  */ 
 static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv)

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -2
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 
 
         /* PLLON Off */ 
-        MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 477

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 478

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable0[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 479

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 480

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable2[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -1
         /* PLLOn On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -497,7 +497,7 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      dwData      - data to write 
  *  Out: 
  *      none 

@@ -507,15 +507,15 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 19 lines
drivers/staging/vt6655/rf.c +3 -3
  */ 
 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; 
         } 

@@ -531,7 +531,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -540,19 +540,19 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool RFbAL2230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, · line 552

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 2 lines
         /* PLL  Off */

- MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 1 line

+ MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 3 lines
         /* patch abnormal AL2230 frequency output */ 
         IFRFbWriteEmbedded(priv,

(0x07168700+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -562,7 +562,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) 
         MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */ 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 567

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 
         ret &= IFRFbWriteEmbedded(priv,

(0x00d80f00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
@@ -571,20 +571,20 @@ static bool RFbAL2230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 572

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 30);/* 30us */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 3 lines
         /* 3-wire control for power saving mode */

- VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 5 lines
         return ret;

}

static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct

Quoted 7 lines

{

drivers/staging/vt6655/rf.c +1 -1
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 

@@ -593,10 +593,10 @@ static bool RFbAL2230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct · line 593

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL2230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -681,7 +681,7 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      uChannel    - channel number 
  *      bySleepCnt  - SleepProgSyn count 
  * 

@@ -691,12 +691,12 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv, · line 691

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char

byRFType,

drivers/staging/vt6655/rf.c bool RFvWriteWakeProgSyn(struct vnt_private *priv,

Quoted 14 lines
drivers/staging/vt6655/rf.c +2 -2
                          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: 

@@ -758,7 +758,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv,

unsigned char byRFType,

Review

Quoted 18 lines
drivers/staging/vt6655/rf.c +2 -2
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none 

@@ -830,7 +830,7 @@ bool RFbSetPower( 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none
(quoted diff) +0 -0

b/drivers/staging/vt6655/srom.c

Quoted 2 lines

index ee99277..0b612d3 100644
--- a/drivers/staging/vt6655/s...

Quoted 1,377 lines · Julia Lawall
Quoted 1 line · Varsha Rao

In this patch dwIoBase is renamed as iobase.This is done to fix the

checkpatch issue of CamelCase.

Put at least one space after a period. Limit the commit message line length to around 70 characters.

Quoted 7 lines
Signed-off-by Varsha Rao <[email protected] <javascript:>>

---

 drivers/staging/vt6655/baseband.c |  52 +++--- 
 drivers/staging/vt6655/baseband.h |   8 +- 
 drivers/staging/vt6655/card.c     |  30 ++-- 
 drivers/staging/vt6655/mac.h      | 322

+++++++++++++++++++-------------------

Review

Quoted 6 lines
 drivers/staging/vt6655/rf.c       |  64 ++++---- 
 drivers/staging/vt6655/srom.c     |  32 ++-- 
 drivers/staging/vt6655/srom.h     |   6 +- 
 7 files changed, 257 insertions(+), 257 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.c

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines

index de503a3..e739ecc 100644

drivers/staging/vt6655/baseband.c +0 -0
@@ -1916,7 +1916,7 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length, · line 1919

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address

You should preserve the alignment of the different comments.

julia

drivers/staging/vt6655/baseband.c void vnt_get_phy_field(struct vnt_private *priv,

Quoted 4 lines
drivers/staging/vt6655/baseband.c +0 -0
  *      byBBAddr    - address of register in Baseband 
  *  Out: 
  *      pbyData     - data read 

@@ -1927,24 +1927,24 @@ void vnt_get_phy_field(struct vnt_private *priv,

u32 frame_length,

Quoted 83 lines
drivers/staging/vt6655/baseband.c +13 -13
 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"); 

@@ -1958,7 +1958,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: 

@@ -1970,20 +1970,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; 
         } 

@@ -2000,7 +2000,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: 

@@ -2014,7 +2014,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2036

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2036,8 +2036,8 @@ bool BBbVT3253Init(struct vnt_private *priv) 
 

                                         byVT3253B0_AGC4_RFMD2959[ii][0],
Quoted 1 line
                                         byVT3253B0_AGC4_RFMD2959[ii][1]);
Quoted 2 lines

- VNSvOutPortD(dwIoBase + MAC_REG_ITRTMSET,

0x23);

Quoted 1 line

- MACvRegBitsOn(dwIoBase, MAC_REG_PAPEDELAY,

BIT(0));

drivers/staging/vt6655/baseband.c

Quoted 2 lines
drivers/staging/vt6655/baseband.c +2 -0
+                        VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); 
+                        MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY,

BIT(0));

Quoted 15 lines
                 } 
                 priv->abyBBVGA[0] = 0x18; 
                 priv->abyBBVGA[1] = 0x0A;
drivers/staging/vt6655/baseband.c +2 -2
@@ -2076,8 +2076,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;

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2098

Quoted 1 line
drivers/staging/vt6655/baseband.c +0 -0
@@ -2098,7 +2098,7 @@ bool BBbVT3253Init(struct vnt_private *priv) 
                  * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B

inverted)

Quoted 17 lines
drivers/staging/vt6655/baseband.c +2 -2
                  */ 
 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x09,0x41);*/ 
 
                 /* Init ANT B select, 
                  * RX Config CR10 = 0x28->0x2A, 

@@ -2106,7 +2106,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);

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2160

Quoted 8 lines
drivers/staging/vt6655/baseband.c +1 -1
@@ -2154,7 +2154,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++)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv) · line 2168

Quoted 3 lines
drivers/staging/vt6655/baseband.c +0 -0
@@ -2167,11 +2167,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)

drivers/staging/vt6655/baseband.c bool BBbVT3253Init(struct vnt_private *priv)

Quoted 5 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*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)

drivers/staging/vt6655/baseband.c void BBvSetVGAGainOffset(struct vnt_private *priv,

Quoted 7 lines
drivers/staging/vt6655/baseband.c +1 -1
                  */ 
-                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/ 
+                /*bResult &= BBbWriteEmbedded(iobase,0x0a,0x28);*/ 
                 /* Select VC1/VC2, CR215 = 0x02->0x06 */ 
                 bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06); 
                 /* }} */ 

@@ -2259,7 +2259,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv,

unsigned char byData)

Review

Quoted 27 lines
drivers/staging/vt6655/baseband.c +3 -3
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2280,7 +2280,7 @@ BBvSoftwareReset(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -2302,7 +2302,7 @@ BBvPowerSaveModeON(struct vnt_private *priv) 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  *
(quoted diff) +0 -0

b/drivers/staging/vt6655/baseband.h

Review

Quoted 20 lines

index a732fba..1d1d4fc 100644

drivers/staging/vt6655/baseband.h +4 -4
@@ -58,11 +58,11 @@ 
 #define TOP_RATE_2M         0x00200000 
 #define TOP_RATE_1M         0x00100000 
 
-#define bbvclearfoe(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0) 
+#define bbvclearfoe(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0) 
 
-#define BBvSetFOE(dwIoBase)                                \ 
-        BBbWriteEmbedded(dwIoBase, 0xB1, 0x0C) 
+#define BBvSetFOE(iobase)                                \ 
+        BBbWriteEmbedded(iobase, 0xB1, 0x0C) 
 
 unsigned int 
 BBuGetFrameTime(
(quoted diff) +0 -0

b/drivers/staging/vt6655/card.c

drivers/staging/vt6655/card.c line 38

Quoted 7 lines

index dbcea44..03790bb 100644

drivers/staging/vt6655/card.c +0 -0
@@ -36,7 +36,7 @@ 
  * 
  * Revision History: 
  *      06-10-2003 Bryan YC Fan:  Re-write codes to support VT3253

spec.

drivers/staging/vt6655/card.c line 39

Quoted 1 line
drivers/staging/vt6655/card.c +0 -1
- *      08-26-2003 Kyle Hsu:      Modify the defination type of

dwIoBase.

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+ *      08-26-2003 Kyle Hsu:      Modify the defination type of iobase. 
  *      09-01-2003 Bryan YC Fan:  Add vUpdateIFS(). 
  * 
  */ 

@@ -938,20 +938,20 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64

qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +2 -2
  */ 
 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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
         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);

drivers/staging/vt6655/card.c u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 · line 954

Quoted 2 lines
drivers/staging/vt6655/card.c +2 -0
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); 
+        VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF +

1);

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 4 lines
drivers/staging/vt6655/card.c +0 -0
         return true; 
 } 

@@ -989,7 +989,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

Quoted 9 lines
drivers/staging/vt6655/card.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase        - IO Base 
+ *      iobase        - IO Base 
  *      wBeaconInterval - Beacon Interval 
  *  Out: 
  *      none 

@@ -999,16 +999,16 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short

wBeaconInterval)

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 8 lines
drivers/staging/vt6655/card.c +1 -1
 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

*/

drivers/staging/vt6655/card.c u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)

Quoted 9 lines
drivers/staging/vt6655/card.c +2 -3
         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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private

Quoted 5 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
 } 
 
 /* 

@@ -1028,12 +1028,12 @@ void CARDvSetFirstNextTBTT(struct vnt_private

*priv,

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 10 lines
drivers/staging/vt6655/card.c +1 -3
 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));

drivers/staging/vt6655/card.c void CARDvSetFirstNextTBTT(struct vnt_private *priv,

Quoted 3 lines
drivers/staging/vt6655/card.c +2 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); 
+        VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >>

32));

drivers/staging/vt6655/mac.h line 557

Quoted 12 lines
drivers/staging/vt6655/card.c +1 -0
+        MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 
         pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); 
 }
drivers/staging/vt6655/mac.h +0 -1
index 030f529..4d8b748 100644 
@@ -554,341 +554,341 @@ 
 
 /*---------------------  Export Macros ------------------------------*/ 
 
-#define MACvRegBitsOn(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 557

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOn(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 558

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 559

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 560

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 561

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOn(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 564

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOn(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 565

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 566

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h line 567

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 568

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData |

(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOn(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 571

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOn(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 572

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 573

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h line 574

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 575

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData |

(dwBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOnEx(dwIoBase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 578

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOnEx(iobase, byRegOfs, byMask,

byBits) \

drivers/staging/vt6655/mac.h line 579

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 580

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 581

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 582

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         byData &=

byMask; \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h line 583

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData |

(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvRegBitsOff(dwIoBase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 586

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvRegBitsOff(iobase, byRegOfs,

byBits) \

drivers/staging/vt6655/mac.h line 587

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 588

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned char

byData; \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortB(dwIoBase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h line 589

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortB(iobase + byRegOfs,

&byData); \

drivers/staging/vt6655/mac.h line 590

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase + byRegOfs, byData &

~(byBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvWordRegBitsOff(dwIoBase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 593

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvWordRegBitsOff(iobase, byRegOfs,

wBits) \

drivers/staging/vt6655/mac.h line 594

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 595

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned short

wData; \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortW(dwIoBase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortW(dwIoBase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h line 596

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortW(iobase + byRegOfs,

&wData); \

drivers/staging/vt6655/mac.h line 597

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortW(iobase + byRegOfs, wData &

~(wBits)); \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
 } while (0) 
 
-#define MACvDWordRegBitsOff(dwIoBase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 600

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define MACvDWordRegBitsOff(iobase, byRegOfs,

dwBits) \

drivers/staging/vt6655/mac.h line 601

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 602

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortD(dwIoBase + byRegOfs, dwData &

~(dwBits)); \

drivers/staging/vt6655/mac.h line 603

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + byRegOfs,

&dwData); \

drivers/staging/vt6655/mac.h line 604

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortD(iobase + byRegOfs, dwData &

~(dwBits)); \

Quoted 74 lines
drivers/staging/vt6655/mac.h +24 -24
 } 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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +2 -4
                     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, \

Quoted 67 lines
drivers/staging/vt6655/mac.h +23 -22
+        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,                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -3
+        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) \

drivers/staging/vt6655/mac.h line 713

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, IMR_MASK_VALUE) 
+#define

MACvClearISR(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_ISR, IMR_MASK_VALUE) 
 
-#define

MACvStart(dwIoBase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvOutPortB(dwIoBase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h line 716

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvStart(iobase) \

drivers/staging/vt6655/mac.h line 717

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvOutPortB(iobase +

MAC_REG_HOSTCR, \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +0 -1
                      (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) 
 
-#define

MACvRx0PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 720

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKT) 
+#define

MACvRx0PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) 
 
-#define

MACvRx0BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 723

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
+#define

MACvRx0BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKTCLR) 
 
-#define

MACvRx1PerPktMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 726

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKT) 
+#define

MACvRx1PerPktMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) 
 
-#define

MACvRx1BufferFillMode(dwIoBase) \

drivers/staging/vt6655/mac.h line 729

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
+#define

MACvRx1BufferFillMode(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKTCLR) 
 
-#define

MACvRxOn(dwIoBase) \

drivers/staging/vt6655/mac.h line 732

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_RXON) 
+#define

MACvRxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_RXON) 
 
-#define

MACvReceive0(dwIoBase) \

drivers/staging/vt6655/mac.h line 735

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+#define

MACvReceive0(iobase) \

drivers/staging/vt6655/mac.h line 736

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
 do

{ \

drivers/staging/vt6655/mac.h line 737

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         unsigned long

dwData; \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-        VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 738

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+        VNSvInPortD(iobase + MAC_REG_RXDMACTL0,

&dwData); \

drivers/staging/vt6655/mac.h line 739

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -0
         if (dwData &

DMACTL_RUN) \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +0 -1
-                VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0,

DMACTL_WAKE); \

drivers/staging/vt6655/mac.h line 740

Quoted 1 line
drivers/staging/vt6655/mac.h +1 -0
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvReceive1(dwIoBase) \

Quoted 1 line

+#define

MACvReceive1(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_RXDMACTL1,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTxOn(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        MACvRegBitsOn(dwIoBase, MAC_REG_HOSTCR, HOSTCR_TXON) 
+#define

MACvTxOn(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        MACvRegBitsOn(iobase, MAC_REG_HOSTCR, HOSTCR_TXON) 
 
-#define

MACvTransmit0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmit0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_TXDMACTL0,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitAC0(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitAC0(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_AC0DMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN);

\

drivers/staging/vt6655/mac.h

Quoted 4 lines
drivers/staging/vt6655/mac.h +1 -1
+                VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ 
 } while (0) 
 
-#define

MACvTransmitSYNC(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitSYNC(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_SYNCDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_SYNCDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_SYNCDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitATIM(dwIoBase) \

Quoted 1 line

+#define

MACvTransmitATIM(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwData; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ATIMDMACTL,

&dwData); \

Quoted 1 line

if (dwData &

DMACTL_RUN) \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_WAKE); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_WAKE);

\

Quoted 1 line
         else                                                                \
Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ATIMDMACTL,

DMACTL_RUN); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ATIMDMACTL, DMACTL_RUN);

\

Quoted 3 lines

} while (0)

-#define

MACvTransmitBCN(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortB(dwIoBase + MAC_REG_BCNDMACTL, BEACON_READY) 
+#define

MACvTransmitBCN(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) 
 
-#define

MACvClearStckDS(dwIoBase) \

Quoted 1 line

+#define

MACvClearStckDS(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned char

byOrgValue; \

Quoted 1 line

- VNSvInPortB(dwIoBase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

+ VNSvInPortB(iobase + MAC_REG_STICKHW,

&byOrgValue); \

Quoted 1 line

byOrgValue = byOrgValue &

0xFC; \

Quoted 1 line

- VNSvOutPortB(dwIoBase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_STICKHW,

byOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadISR(dwIoBase,

pdwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_ISR, pdwValue) 
+#define MACvReadISR(iobase, pdwValue)                                \ 
+        VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) 
 
-#define MACvWriteISR(dwIoBase,

dwValue) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvOutPortD(dwIoBase + MAC_REG_ISR, dwValue) 
+#define MACvWriteISR(iobase, dwValue)                                \ 
+        VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) 
 
-#define MACvIntEnable(dwIoBase,

dwMask) \

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-        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)                                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +4 -4
-                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) \

drivers/staging/vt6655/mac.h

Quoted 5 lines
drivers/staging/vt6655/mac.h +2 -2
-        VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter) 
+#define MACvReadMIBCounter(iobase, pdwCounter)                        \ 
+        VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) 
 
-#define

MACvPwrEvntDisable(dwIoBase) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x0000) 
+#define

MACvPwrEvntDisable(iobase) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvOutPortW(iobase + MAC_REG_WAKEUPEN0, 0x0000) 
 
-#define

MACvEnableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvEnableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableProtectMD(dwIoBase) \

Quoted 1 line

+#define

MACvDisableProtectMD(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_ProtectMd; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvEnableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvEnableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue |

EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define

MACvDisableBarkerPreambleMd(dwIoBase) \

Quoted 1 line

+#define

MACvDisableBarkerPreambleMd(iobase) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BarkerPream; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvSetBBType(dwIoBase,

byTyp) \

Quoted 1 line

+#define MACvSetBBType(iobase,

byTyp) \

Quoted 1 line

do

{ \

Quoted 1 line

unsigned long

dwOrgValue; \

Quoted 1 line

- VNSvInPortD(dwIoBase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

+ VNSvInPortD(iobase + MAC_REG_ENCFG,

&dwOrgValue); \

Quoted 1 line

dwOrgValue = dwOrgValue &

~EnCFG_BBType_MASK; \

Quoted 1 line

dwOrgValue = dwOrgValue | (unsigned

long)byTyp; \

Quoted 1 line

- VNSvOutPortD(dwIoBase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 1 line

+ VNSvOutPortD(iobase + MAC_REG_ENCFG,

dwOrgValue); \

Quoted 3 lines

} while (0)

-#define MACvReadATIMW(dwIoBase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortW(dwIoBase + MAC_REG_AIDATIM, pwCounter) 
+#define MACvReadATIMW(iobase,

pwCounter) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortW(iobase + MAC_REG_AIDATIM, pwCounter) 
 
-#define MACvWriteATIMW(dwIoBase,

wCounter) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvOutPortW(dwIoBase + MAC_REG_AIDATIM, wCounter) 
+#define MACvWriteATIMW(iobase,

wCounter) \

Quoted 4 lines
drivers/staging/vt6655/mac.h +2 -1
+        VNSvOutPortW(iobase + MAC_REG_AIDATIM, wCounter) 
 
-#define MACvWriteCRC16_128(dwIoBase, byRegOfs, wCRC)                \ 
+#define MACvWriteCRC16_128(iobase, byRegOfs, wCRC)                \

drivers/staging/vt6655/mac.h

Quoted 10 lines
drivers/staging/vt6655/mac.h +3 -4
 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) \

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +1 -1
-        VNSvInPortB(dwIoBase + MAC_REG_GPIOCTL1, pbyValue) 
+#define MACvGPIOIn(iobase,

pbyValue) \

drivers/staging/vt6655/mac.h

Quoted 3 lines
drivers/staging/vt6655/mac.h +1 -1
+        VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) 
 
-#define MACvSetRFLE_LatchBase(dwIoBase)

\

Quoted 1 line

- MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/mac.h

Quoted 2 lines
drivers/staging/vt6655/mac.h +2 -0
+#define MACvSetRFLE_LatchBase(iobase)                                 \ 
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_RFLEOPT)

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 8 lines

bool MACbIsRegBitsOn(struct vnt_private *, unsigned char byRegOfs,

                      unsigned char byTestBits);
drivers/staging/vt6655/rf.c +0 -0
index 447882c..92bb1c6 100644 
@@ -410,7 +410,7 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

drivers/staging/vt6655/rf.c static const unsigned long

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -419,16 +419,16 @@ static const unsigned long

dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool s_bAL7230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c static const unsigned long · line 431

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 1 line

BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value

for Calibration */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -436,7 +436,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
                 ret &= IFRFbWriteEmbedded(priv, dwAL7230InitTable[ii]); 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 439

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 450

Quoted 6 lines
drivers/staging/vt6655/rf.c +0 -0
         /* Calibration */ 
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 

@@ -449,7 +449,7 @@ static bool s_bAL7230Init(struct vnt_private *priv) 
         /* TXDCOC:disable, RCK:disable */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL7230InitTable[CB_AL7230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 451

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -458,7 +458,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 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv) · line 461

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private

Quoted 4 lines
drivers/staging/vt6655/rf.c +0 -0
         return ret; 
 } 

@@ -468,26 +468,26 @@ static bool s_bAL7230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 469

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
  */ 
 static bool s_bAL7230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private *priv)

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -2
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 
 
         /* PLLON Off */ 
-        MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 477

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 478

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable0[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 479

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 480

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL7230ChannelTable2[byChannel

- 1]);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -1
         /* PLLOn On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230Init(struct vnt_private · line 482

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -497,7 +497,7 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool s_bAL7230SelectChannel(struct

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      dwData      - data to write 
  *  Out: 
  *      none 

@@ -507,15 +507,15 @@ static bool s_bAL7230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 19 lines
drivers/staging/vt6655/rf.c +3 -3
  */ 
 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; 
         } 

@@ -531,7 +531,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *  Out: 
  *      none 
  * 

@@ -540,19 +540,19 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv,

unsigned long dwData)

Quoted 5 lines
drivers/staging/vt6655/rf.c +1 -1
  */ 
 static bool RFbAL2230Init(struct vnt_private *priv) 
 { 
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset;

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, unsigned long dwData)

Quoted 10 lines
drivers/staging/vt6655/rf.c +1 -2
         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 |

drivers/staging/vt6655/rf.c bool IFRFbWriteEmbedded(struct vnt_private *priv, · line 552

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 2 lines
         /* PLL  Off */

- MACvWordRegBitsOff(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 1 line

+ MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

Quoted 3 lines
         /* patch abnormal AL2230 frequency output */ 
         IFRFbWriteEmbedded(priv,

(0x07168700+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 5 lines
drivers/staging/vt6655/rf.c +0 -1
@@ -562,7 +562,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) 
         MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */ 
 
         /* PLL On */ 
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 565

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL,

SOFTPWRCTL_SWPE3);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private *priv) · line 567

Quoted 3 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 150);/* 150us */ 
         ret &= IFRFbWriteEmbedded(priv,

(0x00d80f00+(BY_AL2230_REG_LEN<<3)+IFREGCTL_REGW));

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
@@ -571,20 +571,20 @@ static bool RFbAL2230Init(struct vnt_private

*priv)

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 572

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -0
         MACvTimer0MicroSDelay(priv, 30);/* 30us */ 
         ret &= IFRFbWriteEmbedded(priv,

dwAL2230InitTable[CB_AL2230_INIT_SEQ-1]);

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 2 lines
drivers/staging/vt6655/rf.c +0 -1
-        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL,

(SOFTPWRCTL_SWPE3 |

drivers/staging/vt6655/rf.c static bool RFbAL2230Init(struct vnt_private · line 573

Quoted 1 line
drivers/staging/vt6655/rf.c +1 -0
+        MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3

|

Quoted 1 line

SOFTPWRCTL_SWPE2 |

Quoted 1 line

SOFTPWRCTL_SWPECTI |

Quoted 1 line

SOFTPWRCTL_TXPEINV));

Quoted 3 lines
         /* 3-wire control for power saving mode */

- VNSvOutPortB(dwIoBase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 1 line

+ VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 |

PSSIG_WPE2)); /* 1100 0000 */

Quoted 5 lines
         return ret;

}

static bool RFbAL2230SelectChannel(struct vnt_private *priv, unsigned

char byChannel)

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct

Quoted 7 lines

{

drivers/staging/vt6655/rf.c +1 -1
-        void __iomem *dwIoBase = priv->PortOffset; 
+        void __iomem *iobase = priv->PortOffset; 
         bool ret; 
 
         ret = true; 

@@ -593,10 +593,10 @@ static bool RFbAL2230SelectChannel(struct

vnt_private *priv, unsigned char byCha

drivers/staging/vt6655/rf.c static bool RFbAL2230SelectChannel(struct · line 593

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
         ret &= IFRFbWriteEmbedded(priv, dwAL2230ChannelTable1[byChannel

- 1]);

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 12 lines
drivers/staging/vt6655/rf.c +2 -2
         /* 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; 
 } 

@@ -681,7 +681,7 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv,

Quoted 9 lines
drivers/staging/vt6655/rf.c +1 -1
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase    - I/O base address 
+ *      iobase    - I/O base address 
  *      uChannel    - channel number 
  *      bySleepCnt  - SleepProgSyn count 
  * 

@@ -691,12 +691,12 @@ bool RFbSelectChannel(struct vnt_private *priv,

unsigned char byRFType,

drivers/staging/vt6655/rf.c bool RFbSelectChannel(struct vnt_private *priv, · line 691

Quoted 1 line
drivers/staging/vt6655/rf.c +0 -0
 bool RFvWriteWakeProgSyn(struct vnt_private *priv, unsigned char

byRFType,

drivers/staging/vt6655/rf.c bool RFvWriteWakeProgSyn(struct vnt_private *priv,

Quoted 14 lines
drivers/staging/vt6655/rf.c +2 -2
                          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: 

@@ -758,7 +758,7 @@ bool RFvWriteWakeProgSyn(struct vnt_private *priv,

unsigned char byRFType,

Review

Quoted 18 lines
drivers/staging/vt6655/rf.c +2 -2
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none 

@@ -830,7 +830,7 @@ bool RFbSetPower( 
  * 
  * Parameters: 
  *  In: 
- *      dwIoBase       - I/O base address 
+ *      iobase       - I/O base address 
  *      dwRFPowerTable - RF Tx Power Setting 
  *  Out: 
  *      none
(quoted diff) +0 -0

b/drivers/staging/vt6655/srom.c

Quoted 2 lines

index ee99277..0b612d3 100644
--- a/drivers/staging/vt6655/s...

author
#3 lore raw
In reply to Julia Lawall
Quoted 7 lines

You should preserve the alignment of the different comments.

I have made the changes in the patch but it is overridden on sent.

#4 lore raw
Quoted 6 lines · Varsha Rao

You should preserve the alignment of the different comments.

      I have made the changes in the patch but it is overridden on sent.

Not sure what you mean. Probably your mail client is misconfigured in some way then?

julia

Quoted 12 lines

--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/e6b02b9a-d35b-4945-b6a6- 1a5a8c964f1d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

author
#5 lore raw
Quoted 5 lines

Not sure what you mean. Probably your mail client is misconfigured in some way then?

At the time of modifying the code, I had aligned it accordingly. But
this alignment would change when sent. I have found solution.