diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-21 11:24:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:09:26 -0700 |
| commit | 42f9f19ef59926c5d881ffce9fd61e0b9b708678 (patch) | |
| tree | a672087c6bcdfc459fc95222733de287972a54d4 /drivers/staging/rtl8723au | |
| parent | c5f3dc2fef61458efd8ef08c3f9bd7b15c143cfd (diff) | |
| download | op-kernel-dev-42f9f19ef59926c5d881ffce9fd61e0b9b708678.zip op-kernel-dev-42f9f19ef59926c5d881ffce9fd61e0b9b708678.tar.gz | |
staging: rtl8723au: Remove another pile of awful unused ODM variables
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 | 18 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/odm.h | 16 |
3 files changed, 0 insertions, 36 deletions
diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c index 0c4756c..491ba9c 100644 --- a/drivers/staging/rtl8723au/hal/odm.c +++ b/drivers/staging/rtl8723au/hal/odm.c @@ -433,24 +433,6 @@ void ODM23a_CmnInfoHook(struct dm_odm_t *pDM_Odm, case ODM_CMNINFO_POWER_SAVING: pDM_Odm->pbPowerSaving = (bool *)pValue; break; - case ODM_CMNINFO_ONE_PATH_CCA: - pDM_Odm->pOnePathCCA = (u8 *)pValue; - break; - case ODM_CMNINFO_DRV_STOP: - pDM_Odm->pbDriverStopped = (bool *)pValue; - break; - case ODM_CMNINFO_PNP_IN: - pDM_Odm->pbDriverIsGoingToPnpSetPowerSleep = (bool *)pValue; - break; - case ODM_CMNINFO_INIT_ON: - pDM_Odm->pinit_adpt_in_progress = (bool *)pValue; - break; - case ODM_CMNINFO_ANT_TEST: - pDM_Odm->pAntennaTest = (u8 *)pValue; - break; - case ODM_CMNINFO_NET_CLOSED: - pDM_Odm->pbNet_closed = (bool *)pValue; - break; /* To remove the compiler warning, must add an empty default statement to handle the other values. */ default: /* do nothing */ diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c index 06b1496..4383c43 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_dm.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_dm.c @@ -159,8 +159,6 @@ static void Update_ODM_ComInfo_8723a(struct rtw_adapter *Adapter) &pHalData->CurrentChannelBW); ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL, &pHalData->CurrentChannel); - ODM23a_CmnInfoHook(pDM_Odm, ODM_CMNINFO_NET_CLOSED, &Adapter->net_closed); - 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 eaee966..7598e61 100644 --- a/drivers/staging/rtl8723au/include/odm.h +++ b/drivers/staging/rtl8723au/include/odm.h @@ -326,12 +326,6 @@ enum odm_cmninfo { ODM_CMNINFO_SCAN, ODM_CMNINFO_POWER_SAVING, - ODM_CMNINFO_ONE_PATH_CCA, /* enum odm_cca_path */ - ODM_CMNINFO_DRV_STOP, - ODM_CMNINFO_PNP_IN, - ODM_CMNINFO_INIT_ON, - ODM_CMNINFO_ANT_TEST, - ODM_CMNINFO_NET_CLOSED, ODM_CMNINFO_MP_MODE, ODM_CMNINFO_WIFI_DIRECT, @@ -713,11 +707,6 @@ struct dm_odm_t { /* Common info for Status */ bool *pbScanInProcess; bool *pbPowerSaving; - /* CCA Path 2-path/path-A/path-B = 0/1/2; using enum odm_cca_path. */ - u8 *pOnePathCCA; - /* pMgntInfo->AntennaTest */ - u8 *pAntennaTest; - bool *pbNet_closed; /* POINTER REFERENCE----------- */ /* */ /* CALL BY VALUE------------- */ @@ -783,11 +772,6 @@ struct dm_odm_t { /* ================================================== */ /* */ - /* common */ - bool *pbDriverStopped; - bool *pbDriverIsGoingToPnpSetPowerSleep; - bool *pinit_adpt_in_progress; - /* PSD */ bool bUserAssignLevel; u8 RSSI_BT; /* come from BT */ |
