diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 11:24:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:09:27 -0700 |
| commit | ac6c69d31128cb479b1b99dcd019aa2c41b9ecfd (patch) | |
| tree | cf4d5c1a9d812b69c37e32b19f10fdecc21e9019 /drivers/staging/rtl8723au | |
| parent | 301fc630ef3ea2f1e855d409cf6be34924f67ac9 (diff) | |
staging: rtl8723au: Eliminate ODM_CMNINFO_CHNL usage
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au')
| -rw-r--r-- | drivers/staging/rtl8723au/hal/odm.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/odm.h | 4 |
3 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c index a15a8cba489d..ac9be2190bb2 100644 --- a/drivers/staging/rtl8723au/hal/odm.c +++ b/drivers/staging/rtl8723au/hal/odm.c @@ -417,9 +417,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm, /* Hook call by reference pointer. */ switch (CmnInfo) { /* Dynamic call by reference pointer. */ - case ODM_CMNINFO_CHNL: - pDM_Odm->pChannel = (u8 *)pValue; - break; case ODM_CMNINFO_SCAN: pDM_Odm->pbScanInProcess = (bool *)pValue; break; @@ -505,11 +502,11 @@ static void odm_CommonInfoSelfUpdate(struct hal_data_8723a *pHalData) if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_40) { if (pHalData->nCur40MhzPrimeSC == 1) - pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) - 2; + pDM_Odm->ControlChannel = pHalData->CurrentChannel - 2; else if (pHalData->nCur40MhzPrimeSC == 2) - pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) + 2; + pDM_Odm->ControlChannel = pHalData->CurrentChannel + 2; } else { - pDM_Odm->ControlChannel = *(pDM_Odm->pChannel); + pDM_Odm->ControlChannel = pHalData->CurrentChannel; } for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) { @@ -546,7 +543,6 @@ void odm_CmnInfoInit_Debug23a(struct dm_odm_t *pDM_Odm) void odm_CmnInfoHook_Debug23a(struct dm_odm_t *pDM_Odm) { ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_CmnInfoHook_Debug23a ==>\n")); - ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pChannel =%d\n", *(pDM_Odm->pChannel))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbScanInProcess =%d\n", *(pDM_Odm->pbScanInProcess))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("pbPowerSaving =%d\n", *(pDM_Odm->pbPowerSaving))); diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c index dfed57e0786d..d1e423192309 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c @@ -152,8 +152,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) /* Pointer reference */ rtl8723a_odm_support_ability_set(Adapter, DYNAMIC_ALL_FUNC_ENABLE); - ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL, - &pHalData->CurrentChannel); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_POWER_SAVING, &pwrctrlpriv->bpower_saving); diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h index be0b84f6220c..022387b23006 100644 --- a/drivers/staging/rtl8723au/include/odm.h +++ b/drivers/staging/rtl8723au/include/odm.h @@ -319,8 +319,6 @@ enum odm_cmninfo { /* */ /* Dynamic value: */ /* */ - ODM_CMNINFO_CHNL, - ODM_CMNINFO_SCAN, ODM_CMNINFO_POWER_SAVING, ODM_CMNINFO_MP_MODE, @@ -686,8 +684,6 @@ struct dm_odm_t { bool bool_temp; struct rtw_adapter *PADAPTER_temp; - /* Central channel location Ch1/Ch2/.... */ - u8 *pChannel; /* central channel number */ /* Common info for Status */ bool *pbScanInProcess; bool *pbPowerSaving; |