tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: rtl8723au: Eliminate ODM_GetBBReg()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jes Sorensen and committed by
Greg Kroah-Hartman 3f9cb6a0 53de9947

+17 -23
+17 -11
drivers/staging/rtl8723au/hal/odm.c
··· 379 379 380 380 } 381 381 382 - void odm_CommonInfoSelfInit23a(struct dm_odm_t *pDM_Odm 383 - ) 382 + void odm_CommonInfoSelfInit23a(struct dm_odm_t *pDM_Odm) 384 383 { 385 - pDM_Odm->bCckHighPower = 386 - (bool) ODM_GetBBReg(pDM_Odm, rFPGA0_XA_HSSIParameter2, BIT(9)); 384 + u32 val32; 385 + 386 + val32 = rtl8723au_read32(pDM_Odm->Adapter, rFPGA0_XA_HSSIParameter2); 387 + if (val32 & BIT(9)) 388 + pDM_Odm->bCckHighPower = true; 389 + else 390 + pDM_Odm->bCckHighPower = false; 391 + 387 392 pDM_Odm->RFPathRxEnable = 388 - (u8) ODM_GetBBReg(pDM_Odm, rOFDM0_TRxPathEnable, 0x0F); 393 + rtl8723au_read32(pDM_Odm->Adapter, rOFDM0_TRxPathEnable) & 0x0F; 389 394 390 395 ODM_InitDebugSetting23a(pDM_Odm); 391 396 } ··· 509 504 void odm_DIG23aInit(struct dm_odm_t *pDM_Odm) 510 505 { 511 506 struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable; 507 + u32 val32; 512 508 513 - pDM_DigTable->CurIGValue = (u8) ODM_GetBBReg(pDM_Odm, 514 - ODM_REG(IGI_A, pDM_Odm), 515 - ODM_BIT(IGI, pDM_Odm)); 509 + val32 = rtl8723au_read32(pDM_Odm->Adapter, ODM_REG_IGI_A_11N); 510 + pDM_DigTable->CurIGValue = val32 & ODM_BIT_IGI_11N; 511 + 516 512 pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW; 517 513 pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH; 518 514 pDM_DigTable->FALowThresh = DM_FALSEALARM_THRESH_LOW; ··· 751 745 ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT(12), 1); 752 746 ODM_SetBBReg(pDM_Odm, ODM_REG_CCK_FA_RST_11N, BIT(14), 1); 753 747 754 - ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_FA_LSB_11N, bMaskByte0); 748 + ret_value = rtl8723au_read32(adapter, ODM_REG_CCK_FA_LSB_11N) & 0xff; 755 749 FalseAlmCnt->Cnt_Cck_fail = ret_value; 756 - ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_FA_MSB_11N, bMaskByte3); 757 - FalseAlmCnt->Cnt_Cck_fail += (ret_value & 0xff) << 8; 750 + ret_value = rtl8723au_read32(adapter, ODM_REG_CCK_FA_MSB_11N) >> 16; 751 + FalseAlmCnt->Cnt_Cck_fail += (ret_value & 0xff00); 758 752 759 753 ret_value = rtl8723au_read32(adapter, ODM_REG_CCK_CCA_CNT_11N); 760 754 FalseAlmCnt->Cnt_CCK_CCA =
-11
drivers/staging/rtl8723au/hal/odm_interface.c
··· 35 35 PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); 36 36 } 37 37 38 - u32 ODM_GetBBReg( 39 - struct dm_odm_t *pDM_Odm, 40 - u32 RegAddr, 41 - u32 BitMask 42 - ) 43 - { 44 - struct rtw_adapter *Adapter = pDM_Odm->Adapter; 45 - 46 - return PHY_QueryBBReg(Adapter, RegAddr, BitMask); 47 - } 48 - 49 38 void ODM_SetRFReg( 50 39 struct dm_odm_t *pDM_Odm, 51 40 enum RF_RADIO_PATH eRFPath,
-1
drivers/staging/rtl8723au/include/odm_interface.h
··· 55 55 /* */ 56 56 57 57 void ODM_SetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data); 58 - u32 ODM_GetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask); 59 58 void ODM_SetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath, 60 59 u32 RegAddr, u32 BitMask, u32 Data); 61 60 u32 ODM_GetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,