diff options
Diffstat (limited to 'drivers/staging/vt6655/card.c')
| -rw-r--r-- | drivers/staging/vt6655/card.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 26e08fec6e6a..ee2d145778ed 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -183,7 +183,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) unsigned char bySlot = 0; unsigned char bySIFS = 0; unsigned char byDIFS = 0; - unsigned char byData; + unsigned char data; int i; /* Set SIFS, DIFS, EIFS, SlotTime, CwMin */ @@ -194,15 +194,15 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) priv->abyBBVGA[0] = 0x20; priv->abyBBVGA[2] = 0x10; priv->abyBBVGA[3] = 0x10; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x1C) + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x1C) bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); } else if (priv->byRFType == RF_UW2452) { MACvSetBBType(priv->port_offset, BB_TYPE_11A); priv->abyBBVGA[0] = 0x18; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x14) { + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x14) { bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE1, 0x57); } @@ -220,14 +220,14 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; priv->abyBBVGA[3] = 0x00; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x20) + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x20) bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); } else if (priv->byRFType == RF_UW2452) { priv->abyBBVGA[0] = 0x14; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x18) { + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x18) { bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE1, 0xD3); } @@ -243,14 +243,14 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) priv->abyBBVGA[0] = 0x1C; priv->abyBBVGA[2] = 0x00; priv->abyBBVGA[3] = 0x00; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x20) + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x20) bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); } else if (priv->byRFType == RF_UW2452) { priv->abyBBVGA[0] = 0x14; - bb_read_embedded(priv, 0xE7, &byData); - if (byData == 0x18) { + bb_read_embedded(priv, 0xE7, &data); + if (data == 0x18) { bb_write_embedded(priv, 0xE7, priv->abyBBVGA[0]); bb_write_embedded(priv, 0xE1, 0xD3); } @@ -404,7 +404,7 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, */ void CARDbRadioPowerOff(struct vnt_private *priv) { - if (priv->bRadioOff) + if (priv->radio_off) return; switch (priv->byRFType) { @@ -429,7 +429,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv) bb_set_deep_sleep(priv, priv->local_id); - priv->bRadioOff = true; + priv->radio_off = true; pr_debug("chester power off\n"); MACvRegBitsOn(priv->port_offset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */ @@ -798,12 +798,12 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF) { void __iomem *iobase = priv->port_offset; unsigned short ww; - unsigned char byData; + unsigned char data; MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_TFTCTL, &byData); - if (!(byData & TFTCTL_TSFCNTRRD)) + VNSvInPortB(iobase + MAC_REG_TFTCTL, &data); + if (!(data & TFTCTL_TSFCNTRRD)) break; } if (ww == W_MAX_TIMEOUT) |