Commit 42f9f19e authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Remove another pile of awful unused ODM variables 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c5f3dc2f

drivers/staging/rtl8723au/hal/odm.c

+0 −18
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/rtl8723au/hal/rtl8723a_dm.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8723au/include/odm.h

+0 −16
Original line number Diff line number Diff line
@@ -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 */