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_SetBBReg()

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 6725e52d 2635f19c

+20 -26
+20 -13
drivers/staging/rtl8723au/hal/odm.c
··· 909 909 if (pDM_PSTable->initialize == 0) { 910 910 911 911 pDM_PSTable->Reg874 = 912 - (rtl8723au_read32(adapter, 0x874) & 0x1CC000) >> 14; 912 + rtl8723au_read32(adapter, 0x874) & 0x1CC000; 913 913 pDM_PSTable->RegC70 = 914 - (rtl8723au_read32(adapter, 0xc70) & BIT(3)) >>3; 914 + rtl8723au_read32(adapter, 0xc70) & BIT(3); 915 915 pDM_PSTable->Reg85C = 916 - (rtl8723au_read32(adapter, 0x85c) & 0xFF000000) >> 24; 917 - pDM_PSTable->RegA74 = 918 - (rtl8723au_read32(adapter, 0xa74) & 0xF000) >> 12; 916 + rtl8723au_read32(adapter, 0x85c) & 0xFF000000; 917 + pDM_PSTable->RegA74 = rtl8723au_read32(adapter, 0xa74) & 0xF000; 919 918 pDM_PSTable->initialize = 1; 920 919 } 921 920 ··· 982 983 val32 |= BIT(28); 983 984 rtl8723au_write32(adapter, 0x818, val32); 984 985 } else { 985 - ODM_SetBBReg(pDM_Odm, 0x874, 0x1CC000, 986 - pDM_PSTable->Reg874); 987 - ODM_SetBBReg(pDM_Odm, 0xc70, BIT(3), 988 - pDM_PSTable->RegC70); 989 - ODM_SetBBReg(pDM_Odm, 0x85c, 0xFF000000, 990 - pDM_PSTable->Reg85C); 991 - ODM_SetBBReg(pDM_Odm, 0xa74, 0xF000, 992 - pDM_PSTable->RegA74); 986 + val32 = rtl8723au_read32(adapter, 0x874); 987 + val32 |= pDM_PSTable->Reg874; 988 + rtl8723au_write32(adapter, 0x874, val32); 989 + 990 + val32 = rtl8723au_read32(adapter, 0xc70); 991 + val32 |= pDM_PSTable->RegC70; 992 + rtl8723au_write32(adapter, 0xc70, val32); 993 + 994 + val32 = rtl8723au_read32(adapter, 0x85c); 995 + val32 |= pDM_PSTable->Reg85C; 996 + rtl8723au_write32(adapter, 0x85c, val32); 997 + 998 + val32 = rtl8723au_read32(adapter, 0xa74); 999 + val32 |= pDM_PSTable->RegA74; 1000 + rtl8723au_write32(adapter, 0xa74, val32); 1001 + 993 1002 val32 = rtl8723au_read32(adapter, 0x818); 994 1003 val32 &= ~BIT(28); 995 1004 rtl8723au_write32(adapter, 0x818, val32);
-12
drivers/staging/rtl8723au/hal/odm_interface.c
··· 23 23 /* */ 24 24 #include <usb_ops_linux.h> 25 25 26 - void ODM_SetBBReg( 27 - struct dm_odm_t *pDM_Odm, 28 - u32 RegAddr, 29 - u32 BitMask, 30 - u32 Data 31 - ) 32 - { 33 - struct rtw_adapter *Adapter = pDM_Odm->Adapter; 34 - 35 - PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); 36 - } 37 - 38 26 void ODM_SetRFReg( 39 27 struct dm_odm_t *pDM_Odm, 40 28 enum RF_RADIO_PATH eRFPath,
-1
drivers/staging/rtl8723au/include/odm_interface.h
··· 54 54 /* =========== EXtern Function Prototype */ 55 55 /* */ 56 56 57 - void ODM_SetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data); 58 57 void ODM_SetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath, 59 58 u32 RegAddr, u32 BitMask, u32 Data); 60 59 u32 ODM_GetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,