staging: vt6655: baseband/rf s_bAL7230Init change __iomem for baseband functions

Replace __iomem with vnt_private providing pointer for dwIoBase

Change BBvPowerSaveModeON and BBvPowerSaveModeOFF to vnt_private and
reference __iomem there, to be removed later.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index c6c811b18f46b380c9db16fb866c4520b4ddff22..9d5288ca2ed2fea495e6be072b3853ff003207a4 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -2289,8 +2289,9 @@ BBvSoftwareReset(struct vnt_private *priv)
  *
  */
 void
-BBvPowerSaveModeON(void __iomem *dwIoBase)
+BBvPowerSaveModeON(struct vnt_private *priv)
 {
+       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byOrgData;
 
        BBbReadEmbedded(dwIoBase, 0x0D, &byOrgData);
@@ -2311,8 +2312,9 @@ BBvPowerSaveModeON(void __iomem *dwIoBase)
  *
  */
 void
-BBvPowerSaveModeOFF(void __iomem *dwIoBase)
+BBvPowerSaveModeOFF(struct vnt_private *priv)
 {
+       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byOrgData;
 
        BBbReadEmbedded(dwIoBase, 0x0D, &byOrgData);

diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index 8594347f45acc9cfa9565fa66b6834a530810cf6..26f9cdcb24b8f690e37d12e83db2b437b513d2c8 100644 (file)
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -86,8 +86,8 @@ void BBvSetVGAGainOffset(struct vnt_private *, unsigned char byData);
 /* VT3253 Baseband */
 bool BBbVT3253Init(struct vnt_private *);
 void BBvSoftwareReset(struct vnt_private *);
-void BBvPowerSaveModeON(void __iomem *dwIoBase);
-void BBvPowerSaveModeOFF(void __iomem *dwIoBase);
+void BBvPowerSaveModeON(struct vnt_private *);
+void BBvPowerSaveModeOFF(struct vnt_private *);
 void BBvSetTxAntennaMode(struct vnt_private *, unsigned char byAntennaMode);
 void BBvSetRxAntennaMode(struct vnt_private *, unsigned char byAntennaMode);
 void BBvSetDeepSleep(struct vnt_private *, unsigned char byLocalID);

diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index e505af91bfd042466dab27830a29f882d7f860f3..2b1e7a09360eef334f7d9d94d5e3b5f1c751d08d 100644 (file)
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -424,8 +424,9 @@ static const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = {
  * Return Value: true if succeeded; false if failed.
  *
  */
-static bool s_bAL7230Init(void __iomem *dwIoBase)
+static bool s_bAL7230Init(struct vnt_private *priv)
 {
+       void __iomem *dwIoBase = priv->PortOffset;
        int     ii;
        bool bResult;
 
@@ -436,7 +437,7 @@ static bool s_bAL7230Init(void __iomem *dwIoBase)
 
        MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
-       BBvPowerSaveModeOFF(dwIoBase); //RobertYu:20050106, have DC value for Calibration
+       BBvPowerSaveModeOFF(priv); /* RobertYu:20050106, have DC value for Calibration */
 
        for (ii = 0; ii < CB_AL7230_INIT_SEQ; ii++)
                bResult &= IFRFbWriteEmbedded(dwIoBase, dwAL7230InitTable[ii]);
@@ -457,7 +458,7 @@ static bool s_bAL7230Init(void __iomem *dwIoBase)
                                                         SOFTPWRCTL_SWPECTI  |
                                                         SOFTPWRCTL_TXPEINV));
 
-       BBvPowerSaveModeON(dwIoBase); // RobertYu:20050106
+       BBvPowerSaveModeON(priv); /* RobertYu:20050106 */
 
        // PE1: TX_ON, PE2: RX_ON, PE3: PLLON
        //3-wire control for power saving mode
@@ -759,7 +760,7 @@ bool RFbInit(
                break;
        case RF_AIROHA7230:
                pDevice->byMaxPwrLevel = AL7230_PWR_IDX_LEN;
-               bResult = s_bAL7230Init(pDevice->PortOffset);
+               bResult = s_bAL7230Init(pDevice);
                break;
        case RF_NOTHING:
                bResult = true;