diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2021-09-11 00:38:47 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2021-09-11 00:38:47 +0200 |
commit | c2f4954c2d3fc4f77b46c67585e17a58df4ba8e4 (patch) | |
tree | 533a2077028e02a851e51ad509a0aa3a9107999f /drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | |
parent | drivers: base: cacheinfo: Get rid of DEFINE_SMP_CALL_CACHE_FUNCTION() (diff) | |
parent | Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
download | linux-dev-c2f4954c2d3fc4f77b46c67585e17a58df4ba8e4.tar.xz linux-dev-c2f4954c2d3fc4f77b46c67585e17a58df4ba8e4.zip |
Merge branch 'linus' into smp/urgent
Ensure that all usage sites of get/put_online_cpus() except for the
struggler in drivers/thermal are gone. So the last user and the deprecated
inlines can be removed.
Diffstat (limited to 'drivers/staging/rtl8723bs/hal/odm_CfoTracking.c')
-rw-r--r-- | drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c index 0f6b9d661e39..928c58be6c9b 100644 --- a/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c +++ b/drivers/staging/rtl8723bs/hal/odm_CfoTracking.c @@ -94,7 +94,7 @@ void ODM_CfoTracking(void *pDM_VOID) { struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; - int CFO_kHz_A, CFO_kHz_B, CFO_ave = 0; + int CFO_kHz_A, CFO_ave = 0; int CFO_ave_diff; int CrystalCap = (int)pCfoTrack->CrystalCap; u8 Adjust_Xtal = 1; @@ -117,12 +117,8 @@ void ODM_CfoTracking(void *pDM_VOID) /* 4 1.2 Calculate CFO */ CFO_kHz_A = (int)(pCfoTrack->CFO_tail[0] * 3125) / 1280; - CFO_kHz_B = (int)(pCfoTrack->CFO_tail[1] * 3125) / 1280; - if (pDM_Odm->RFType < ODM_2T2R) - CFO_ave = CFO_kHz_A; - else - CFO_ave = (int)(CFO_kHz_A + CFO_kHz_B) >> 1; + CFO_ave = CFO_kHz_A; /* 4 1.3 Avoid abnormal large CFO */ CFO_ave_diff = @@ -188,26 +184,28 @@ void ODM_CfoTracking(void *pDM_VOID) } } -void ODM_ParsingCFO(void *pDM_VOID, void *pPktinfo_VOID, s8 *pcfotail) +void odm_parsing_cfo(void *dm_void, void *pkt_info_void, s8 *cfotail) { - struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID; - struct odm_packet_info *pPktinfo = pPktinfo_VOID; - struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack; + struct dm_odm_t *dm_odm = (struct dm_odm_t *)dm_void; + struct odm_packet_info *pkt_info = pkt_info_void; + struct cfo_tracking *cfo_track = &dm_odm->DM_CfoTrack; u8 i; - if (!(pDM_Odm->SupportAbility & ODM_BB_CFO_TRACKING)) + if (!(dm_odm->SupportAbility & ODM_BB_CFO_TRACKING)) return; - if (pPktinfo->station_id != 0) { - /* 3 Update CFO report for path-A & path-B */ - /* Only paht-A and path-B have CFO tail and short CFO */ - for (i = ODM_RF_PATH_A; i <= ODM_RF_PATH_B; i++) - pCfoTrack->CFO_tail[i] = (int)pcfotail[i]; + if (pkt_info->station_id != 0) { + /* + * 3 Update CFO report for path-A & path-B + * Only paht-A and path-B have CFO tail and short CFO + */ + for (i = RF_PATH_A; i <= RF_PATH_B; i++) + cfo_track->CFO_tail[i] = (int)cfotail[i]; /* 3 Update packet counter */ - if (pCfoTrack->packetCount == 0xffffffff) - pCfoTrack->packetCount = 0; + if (cfo_track->packetCount == 0xffffffff) + cfo_track->packetCount = 0; else - pCfoTrack->packetCount++; + cfo_track->packetCount++; } } |