staging: vt6655: BBbReadEmbedded replace __iomem with vnt_private

Changing callers to point to private

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 f1f10754963d376f0e6f28c8b4c5bc69d5af70df..86c72ba0a0cd5cc019ef068dcec54886f88e7653 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1961,8 +1961,10 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,
  * Return Value: true if succeeded; false if failed.
  *
  */
-bool BBbReadEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)
+bool BBbReadEmbedded(struct vnt_private *priv,
+                    unsigned char byBBAddr, unsigned char *pbyData)
 {
+       void __iomem *dwIoBase = priv->PortOffset;
        unsigned short ww;
        unsigned char byValue;
 
@@ -2222,7 +2224,7 @@ BBvSetShortSlotTime(struct vnt_private *priv)
        unsigned char byBBRxConf = 0;
        unsigned char byBBVGA = 0;
 
-       BBbReadEmbedded(priv->PortOffset, 0x0A, &byBBRxConf); /* CR10 */
+       BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */
 
        if (priv->bShortSlotTime)
                byBBRxConf &= 0xDF; /* 1101 1111 */
@@ -2230,7 +2232,7 @@ BBvSetShortSlotTime(struct vnt_private *priv)
                byBBRxConf |= 0x20; /* 0010 0000 */
 
        /* patch for 3253B0 Baseband with Cardbus module */
-       BBbReadEmbedded(priv->PortOffset, 0xE7, &byBBVGA);
+       BBbReadEmbedded(priv, 0xE7, &byBBVGA);
        if (byBBVGA == priv->abyBBVGA[0])
                byBBRxConf |= 0x20; /* 0010 0000 */
 
@@ -2243,7 +2245,7 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, unsigned char byData)
 
        BBbWriteEmbedded(priv, 0xE7, byData);
 
-       BBbReadEmbedded(priv->PortOffset, 0x0A, &byBBRxConf); /* CR10 */
+       BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */
        /* patch for 3253B0 Baseband with Cardbus module */
        if (byData == priv->abyBBVGA[0])
                byBBRxConf |= 0x20; /* 0010 0000 */
@@ -2291,10 +2293,9 @@ BBvSoftwareReset(struct vnt_private *priv)
 void
 BBvPowerSaveModeON(struct vnt_private *priv)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byOrgData;
 
-       BBbReadEmbedded(dwIoBase, 0x0D, &byOrgData);
+       BBbReadEmbedded(priv, 0x0D, &byOrgData);
        byOrgData |= BIT(0);
        BBbWriteEmbedded(priv, 0x0D, byOrgData);
 }
@@ -2314,10 +2315,9 @@ BBvPowerSaveModeON(struct vnt_private *priv)
 void
 BBvPowerSaveModeOFF(struct vnt_private *priv)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byOrgData;
 
-       BBbReadEmbedded(dwIoBase, 0x0D, &byOrgData);
+       BBbReadEmbedded(priv, 0x0D, &byOrgData);
        byOrgData &= ~(BIT(0));
        BBbWriteEmbedded(priv, 0x0D, byOrgData);
 }
@@ -2339,10 +2339,9 @@ BBvPowerSaveModeOFF(struct vnt_private *priv)
 void
 BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byBBTxConf;
 
-       BBbReadEmbedded(dwIoBase, 0x09, &byBBTxConf); /* CR09 */
+       BBbReadEmbedded(priv, 0x09, &byBBTxConf); /* CR09 */
        if (byAntennaMode == ANT_DIVERSITY) {
                /* bit 1 is diversity */
                byBBTxConf |= 0x02;
@@ -2373,10 +2372,9 @@ BBvSetTxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
 void
 BBvSetRxAntennaMode(struct vnt_private *priv, unsigned char byAntennaMode)
 {
-       void __iomem *dwIoBase = priv->PortOffset;
        unsigned char byBBRxConf;
 
-       BBbReadEmbedded(dwIoBase, 0x0A, &byBBRxConf); /* CR10 */
+       BBbReadEmbedded(priv, 0x0A, &byBBRxConf); /* CR10 */
        if (byAntennaMode == ANT_DIVERSITY) {
                byBBRxConf |= 0x01;
 

diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index 743ec4f6538c52b6f0b5d4dc367c4000261a5f6c..d9f6d63e4ab70b73628aa75b8c61a9ce57ffcf8a 100644 (file)
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -77,7 +77,7 @@ BBuGetFrameTime(
 void vnt_get_phy_field(struct vnt_private *, u32 frame_length,
                       u16 tx_rate, u8 pkt_type, struct vnt_phy_field *);
 
-bool BBbReadEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char *pbyData);
+bool BBbReadEmbedded(struct vnt_private *, unsigned char byBBAddr, unsigned char *pbyData);
 bool BBbWriteEmbedded(struct vnt_private *, unsigned char byBBAddr, unsigned char byData);
 
 void BBvSetShortSlotTime(struct vnt_private *);

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 6f1cea03513ecfdae6e13a098933fec7cedd6b63..1869557e41d31b01620705ba386489fdc8a37311 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -223,14 +223,14 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
                        pDevice->abyBBVGA[0] = 0x20;
                        pDevice->abyBBVGA[2] = 0x10;
                        pDevice->abyBBVGA[3] = 0x10;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x1C)
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
 
                } else if (pDevice->byRFType == RF_UW2452) {
                        MACvSetBBType(pDevice->PortOffset, BB_TYPE_11A);
                        pDevice->abyBBVGA[0] = 0x18;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x14) {
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
                                BBbWriteEmbedded(pDevice, 0xE1, 0x57);
@@ -249,13 +249,13 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
                        pDevice->abyBBVGA[0] = 0x1C;
                        pDevice->abyBBVGA[2] = 0x00;
                        pDevice->abyBBVGA[3] = 0x00;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x20)
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
 
                } else if (pDevice->byRFType == RF_UW2452) {
                        pDevice->abyBBVGA[0] = 0x14;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x18) {
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
                                BBbWriteEmbedded(pDevice, 0xE1, 0xD3);
@@ -272,13 +272,13 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
                        pDevice->abyBBVGA[0] = 0x1C;
                        pDevice->abyBBVGA[2] = 0x00;
                        pDevice->abyBBVGA[3] = 0x00;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x20)
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
 
                } else if (pDevice->byRFType == RF_UW2452) {
                        pDevice->abyBBVGA[0] = 0x14;
-                       BBbReadEmbedded(pDevice->PortOffset, 0xE7, &byData);
+                       BBbReadEmbedded(pDevice, 0xE7, &byData);
                        if (byData == 0x18) {
                                BBbWriteEmbedded(pDevice, 0xE7, pDevice->abyBBVGA[0]);
                                BBbWriteEmbedded(pDevice, 0xE1, 0xD3);