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: odm.c: Use rtl8723au_{read, write}32() for 32 bit register access

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 a39bd1f5 2c177a8c

+16 -19
+16 -19
drivers/staging/rtl8723au/hal/odm.c
··· 714 714 715 715 void odm_FalseAlarmCounterStatistics23a(struct dm_odm_t *pDM_Odm) 716 716 { 717 - u32 ret_value; 717 + struct rtw_adapter *adapter = pDM_Odm->Adapter; 718 718 struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt; 719 + u32 ret_value; 719 720 720 721 /* hold ofdm counter */ 721 - /* hold page C counter */ 722 + /* hold page C counter */ 722 723 ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); 723 724 /* hold page D counter */ 724 725 ODM_SetBBReg(pDM_Odm, ODM_REG_OFDM_FA_RSTD_11N, BIT(31), 1); 725 - ret_value = 726 - ODM_GetBBReg(pDM_Odm, ODM_REG_OFDM_FA_TYPE1_11N, bMaskDWord); 726 + ret_value = rtl8723au_read32(adapter, ODM_REG_OFDM_FA_TYPE1_11N); 727 727 FalseAlmCnt->Cnt_Fast_Fsync = (ret_value&0xffff); 728 728 FalseAlmCnt->Cnt_SB_Search_fail = (ret_value & 0xffff0000)>>16; 729 - ret_value = 730 - ODM_GetBBReg(pDM_Odm, ODM_REG_OFDM_FA_TYPE2_11N, bMaskDWord); 729 + ret_value = rtl8723au_read32(adapter, ODM_REG_OFDM_FA_TYPE2_11N); 731 730 FalseAlmCnt->Cnt_OFDM_CCA = (ret_value&0xffff); 732 731 FalseAlmCnt->Cnt_Parity_Fail = (ret_value & 0xffff0000)>>16; 733 - ret_value = 734 - ODM_GetBBReg(pDM_Odm, ODM_REG_OFDM_FA_TYPE3_11N, bMaskDWord); 732 + ret_value = rtl8723au_read32(adapter, ODM_REG_OFDM_FA_TYPE3_11N); 735 733 FalseAlmCnt->Cnt_Rate_Illegal = (ret_value&0xffff); 736 734 FalseAlmCnt->Cnt_Crc8_fail = (ret_value & 0xffff0000)>>16; 737 - ret_value = 738 - ODM_GetBBReg(pDM_Odm, ODM_REG_OFDM_FA_TYPE4_11N, bMaskDWord); 735 + ret_value = rtl8723au_read32(adapter, ODM_REG_OFDM_FA_TYPE4_11N); 739 736 FalseAlmCnt->Cnt_Mcs_fail = (ret_value&0xffff); 740 737 741 738 FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + ··· 750 753 ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_FA_MSB_11N, bMaskByte3); 751 754 FalseAlmCnt->Cnt_Cck_fail += (ret_value & 0xff) << 8; 752 755 753 - ret_value = ODM_GetBBReg(pDM_Odm, ODM_REG_CCK_CCA_CNT_11N, bMaskDWord); 756 + ret_value = rtl8723au_read32(adapter, ODM_REG_CCK_CCA_CNT_11N); 754 757 FalseAlmCnt->Cnt_CCK_CCA = 755 758 ((ret_value&0xFF)<<8) | ((ret_value&0xFF00)>>8); 756 759 ··· 878 881 void ODM_RF_Saving23a(struct dm_odm_t *pDM_Odm, u8 bForceInNormal) 879 882 { 880 883 struct dynamic_pwr_sav *pDM_PSTable = &pDM_Odm->DM_PSTable; 884 + struct rtw_adapter *adapter = pDM_Odm->Adapter; 881 885 u8 Rssi_Up_bound = 30; 882 886 u8 Rssi_Low_bound = 25; 883 887 if (pDM_PSTable->initialize == 0) { 884 888 885 - pDM_PSTable->Reg874 = (ODM_GetBBReg(pDM_Odm, 0x874, 886 - bMaskDWord)&0x1CC000) >> 14; 889 + pDM_PSTable->Reg874 = 890 + (rtl8723au_read32(adapter, 0x874) & 0x1CC000) >> 14; 887 891 pDM_PSTable->RegC70 = 888 - (ODM_GetBBReg(pDM_Odm, 0xc70, bMaskDWord) & BIT(3)) >>3; 889 - pDM_PSTable->Reg85C = (ODM_GetBBReg(pDM_Odm, 0x85c, 890 - bMaskDWord)&0xFF000000)>>24; 891 - pDM_PSTable->RegA74 = (ODM_GetBBReg(pDM_Odm, 0xa74, 892 - bMaskDWord)&0xF000)>>12; 893 - /* Reg818 = PHY_QueryBBReg(pAdapter, 0x818, bMaskDWord); */ 892 + (rtl8723au_read32(adapter, 0xc70) & BIT(3)) >>3; 893 + pDM_PSTable->Reg85C = 894 + (rtl8723au_read32(adapter, 0x85c) & 0xFF000000) >> 24; 895 + pDM_PSTable->RegA74 = 896 + (rtl8723au_read32(adapter, 0xa74) & 0xF000) >> 12; 894 897 pDM_PSTable->initialize = 1; 895 898 } 896 899