diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-11-06 20:02:01 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:23:28 -0800 |
| commit | a5f0eef38b574248119353667eeee69559b9c291 (patch) | |
| tree | 7bf630edfd61591fe6603985a1a0989d62d3a0ab /drivers/staging/vt6655/baseband.c | |
| parent | 314e5caa4b41555aec20ac39dd3df1ccc799bc65 (diff) | |
| download | linux-a5f0eef38b574248119353667eeee69559b9c291.tar.bz2 | |
staging: vt6655: baseband replace __iomem where caller is priv dereferenced.
Replace with stucture vnt_private *priv
in functions
BBvSoftwareReset
BBvSetTxAntennaMode
BBvSetRxAntennaMode
BBvSetDeepSleep
BBvExitDeepSleep
__iomem *dwIoBase will be moved into BBbWriteEmbedded and BBbReadEmbedded
later.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/baseband.c')
| -rw-r--r-- | drivers/staging/vt6655/baseband.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 32000d2bedb1..c6c811b18f46 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1719,22 +1719,22 @@ s_vChangeAntenna( if (priv->dwRxAntennaSel == 0) { priv->dwRxAntennaSel = 1; if (priv->bTxRxAntInv == true) - BBvSetRxAntennaMode(priv->PortOffset, ANT_A); + BBvSetRxAntennaMode(priv, ANT_A); else - BBvSetRxAntennaMode(priv->PortOffset, ANT_B); + BBvSetRxAntennaMode(priv, ANT_B); } else { priv->dwRxAntennaSel = 0; if (priv->bTxRxAntInv == true) - BBvSetRxAntennaMode(priv->PortOffset, ANT_B); + BBvSetRxAntennaMode(priv, ANT_B); else - BBvSetRxAntennaMode(priv->PortOffset, ANT_A); + BBvSetRxAntennaMode(priv, ANT_A); } if (priv->dwTxAntennaSel == 0) { priv->dwTxAntennaSel = 1; - BBvSetTxAntennaMode(priv->PortOffset, ANT_B); + BBvSetTxAntennaMode(priv, ANT_B); } else { priv->dwTxAntennaSel = 0; - BBvSetTxAntennaMode(priv->PortOffset, ANT_A); + BBvSetTxAntennaMode(priv, ANT_A); } } @@ -2266,8 +2266,10 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData) * */ void -BBvSoftwareReset(void __iomem *dwIoBase) +BBvSoftwareReset(struct vnt_private *priv) { + void __iomem *dwIoBase = priv->PortOffset; + BBbWriteEmbedded(dwIoBase, 0x50, 0x40); BBbWriteEmbedded(dwIoBase, 0x50, 0); BBbWriteEmbedded(dwIoBase, 0x9C, 0x01); @@ -2333,8 +2335,9 @@ BBvPowerSaveModeOFF(void __iomem *dwIoBase) */ void -BBvSetTxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode) +BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode) { + void __iomem *dwIoBase = priv->PortOffset; unsigned char byBBTxConf; BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf); /* CR09 */ @@ -2366,8 +2369,9 @@ BBvSetTxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode) */ void -BBvSetRxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode) +BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode) { + void __iomem *dwIoBase = priv->PortOffset; unsigned char byBBRxConf; BBbReadEmbedded(dwIoBase, 0x0A, &byBBRxConf); /* CR10 */ @@ -2396,15 +2400,19 @@ BBvSetRxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode) * */ void -BBvSetDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID) +BBvSetDeepSleep(struct vnt_private *priv, unsigned char byLocalID) { + void __iomem *dwIoBase = priv->PortOffset; + BBbWriteEmbedded(dwIoBase, 0x0C, 0x17); /* CR12 */ BBbWriteEmbedded(dwIoBase, 0x0D, 0xB9); /* CR13 */ } void -BBvExitDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID) +BBvExitDeepSleep(struct vnt_private *priv, unsigned char byLocalID) { + void __iomem *dwIoBase = priv->PortOffset; + BBbWriteEmbedded(dwIoBase, 0x0C, 0x00); /* CR12 */ BBbWriteEmbedded(dwIoBase, 0x0D, 0x01); /* CR13 */ } |