This is equivalent to PHY_GetBBReg.

Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>
---
 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c      | 8 ++++----
 drivers/staging/rtl8188eu/hal/odm_interface.c     | 6 ------
 drivers/staging/rtl8188eu/include/odm_interface.h | 2 --
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c 
b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 1f0d3cf..fb80afe 100644
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -46,7 +46,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm)
        ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, 
("odm_RX_HWAntDivInit()\n"));
 
        /* MAC Setting */
-       value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+       value32 = PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
        PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, 
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
        /* Pin Settings */
        PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/* 
Reg870[8]=1'b0, Reg870[9]=1'b0     antsel antselb by HW */
@@ -76,7 +76,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm)
        ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, 
("odm_TRX_HWAntDivInit()\n"));
 
        /* MAC Setting */
-       value32 = ODM_GetMACReg(dm_odm, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
+       value32 = PHY_QueryBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord);
        PHY_SetBBReg(adapter, ODM_REG_ANTSEL_PIN_11N, bMaskDWord, 
value32|(BIT23|BIT25)); /* Reg4C[25]=1, Reg4C[23]=1 for pin output */
        /* Pin Settings */
        PHY_SetBBReg(adapter, ODM_REG_PIN_CTRL_11N, BIT9|BIT8, 0);/* 
Reg870[8]=1'b0, Reg870[9]=1'b0             antsel antselb by HW */
@@ -125,9 +125,9 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct 
*dm_odm)
        dm_fat_tbl->FAT_State = FAT_NORMAL_STATE;
 
        /* MAC Setting */
-       value32 = ODM_GetMACReg(dm_odm, 0x4c, bMaskDWord);
+       value32 = PHY_QueryBBReg(adapter, 0x4c, bMaskDWord);
        PHY_SetBBReg(adapter, 0x4c, bMaskDWord, value32|(BIT23|BIT25)); /* 
Reg4C[25]=1, Reg4C[23]=1 for pin output */
-       value32 = ODM_GetMACReg(dm_odm,  0x7B4, bMaskDWord);
+       value32 = PHY_QueryBBReg(adapter,  0x7B4, bMaskDWord);
        PHY_SetBBReg(adapter, 0x7b4, bMaskDWord, value32|(BIT16|BIT17)); /* 
Reg7B4[16]=1 enable antenna training, Reg7B4[17]=1 enable A2 match */
 
        /* Match MAC ADDR */
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c 
b/drivers/staging/rtl8188eu/hal/odm_interface.c
index 715becb..e6b3543 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -57,12 +57,6 @@ void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u32 
RegAddr, u32 Data)
        rtw_write32(Adapter, RegAddr, Data);
 }
 
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask)
-{
-       struct adapter *Adapter = pDM_Odm->Adapter;
-       return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
-}
-
 /*  ODM Memory relative API. */
 void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 length)
 {
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h 
b/drivers/staging/rtl8188eu/include/odm_interface.h
index 073879a..73110c8 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -89,8 +89,6 @@ void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u32 
RegAddr, u16 Data);
 
 void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 Data);
 
-u32 ODM_GetMACReg(struct odm_dm_struct *pDM_Odm, u32 RegAddr, u32 BitMask);
-
 /*  Memory Relative Function. */
 void ODM_AllocateMemory(struct odm_dm_struct *pDM_Odm, void **pPtr, u32 
length);
 void ODM_FreeMemory(struct odm_dm_struct *pDM_Odm, void *pPtr, u32 length);
-- 
1.8.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to