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

staging: rtl8723au: Remove a bunch of unused clutter from the ODM code 



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

drivers/staging/rtl8723au/hal/odm.c

+0 −16
Original line number Diff line number Diff line
@@ -1576,22 +1576,6 @@ void odm_RSSIMonitorCheck23aAP(struct dm_odm_t *pDM_Odm) 
{

}



void ODM_InitAllTimers(struct dm_odm_t *pDM_Odm)

{

	setup_timer(&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer,

		    odm_SwAntDivChkAntSwitchCallback23a, (unsigned long)pDM_Odm);

}



void ODM_CancelAllTimers(struct dm_odm_t *pDM_Odm)

{

	del_timer_sync(&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer);

}



void ODM_ReleaseAllTimers(struct dm_odm_t *pDM_Odm)

{

	ODM_ReleaseTimer(pDM_Odm, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer);

}



/* endif */

/* 3 ============================================================ */

/* 3 Tx Power Tracking */

drivers/staging/rtl8723au/hal/odm_interface.c

+0 −41
Original line number Diff line number Diff line
@@ -153,44 +153,3 @@ u32 ODM_GetRFReg( 


	return PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask);

}
 


/*  */

/*  Work item relative API. FOr MP driver only~! */

/*  */

void ODM_InitializeWorkItem(

	struct dm_odm_t *pDM_Odm,

	void *pRtWorkItem,

	RT_WORKITEM_CALL_BACK		RtWorkItemCallback,

	void *pContext,

	const char *szID

	)

{

}



/*  */

/*  ODM Timer relative API. */

/*  */

void ODM_SetTimer(struct dm_odm_t *pDM_Odm, struct timer_list *pTimer, u32 msDelay)

{

	mod_timer(pTimer, jiffies + msecs_to_jiffies(msDelay)); /* ms */

}



void ODM_ReleaseTimer(struct dm_odm_t *pDM_Odm, struct timer_list *pTimer)

{

}



/*  */

/*  ODM FW relative API. */

/*  */

u32 ODM_FillH2CCmd(

	u8 *pH2CBuffer,

	u32		H2CBufferLen,

	u32		CmdNum,

	u32 *pElementID,

	u32 *pCmdLen,

	u8 **pCmbBuffer,

	u8 *CmdStartSeq

	)

{

	return	true;

}

drivers/staging/rtl8723au/include/odm.h

+0 −19
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ struct rx_hp { 
	bool		First_time_enter;

	bool		RXHP_enable;

	u8		TP_Mode;

	struct timer_list PSDTimer;

};



#define ASSOCIATE_ENTRY_NUM					32 /*  Max size of AsocEntry[]. */
@@ -234,14 +233,12 @@ struct sw_ant_sw { 
	u64		RXByteCnt_A;

	u64		RXByteCnt_B;

	u8		TrafficLoad;

	struct timer_list SwAntennaSwitchTimer;

};



struct edca_turbo {

	bool bCurrentTurboEDCA;

	bool bIsCurRDLState;

	u32	prv_traffic_idx; /*  edca turbo */



};



struct odm_rate_adapt {
@@ -762,7 +759,6 @@ enum ant_dif_type { 


/*  2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration. */

struct dm_odm_t {

	/* struct timer_list FastAntTrainingTimer; */

	/*  */

	/*	Add for different team use temporarily */

	/*  */
@@ -928,7 +924,6 @@ struct dm_odm_t { 


	/* PSD */

	bool			bUserAssignLevel;

	struct timer_list	PSDTimer;

	u8			RSSI_BT;			/* come from BT */

	bool			bPSDinProcess;

	bool			bDMInitialGainEnable;
@@ -955,14 +950,6 @@ struct dm_odm_t { 
	/*  */

	/*  ODM system resource. */

	/*  */



	/*  ODM relative time. */

	struct timer_list PathDivSwitchTimer;

	/* 2011.09.27 add for Path Diversity */

	struct timer_list CCKPathDiversityTimer;

	struct timer_list FastAntTrainingTimer;



	/*  ODM relative workitem. */

};	/*  DM_Dynamic_Mechanism_Structure */



enum odm_rf_content {
@@ -1186,12 +1173,6 @@ void ODM_CmnInfoPtrArrayHook23a(struct dm_odm_t *pDM_Odm, enum odm_cmninfo CmnIn 


void ODM_CmnInfoUpdate23a(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value);



void ODM_InitAllTimers(struct dm_odm_t *pDM_Odm);



void ODM_CancelAllTimers(struct dm_odm_t *pDM_Odm);



void ODM_ReleaseAllTimers(struct dm_odm_t *pDM_Odm);



void ODM_ResetIQKResult(struct dm_odm_t *pDM_Odm);



void ODM_AntselStatistics_88C(struct dm_odm_t *pDM_Odm, u8 MacId, u32 PWDBAll, bool isCCKrate);

drivers/staging/rtl8723au/include/odm_interface.h

+0 −49
Original line number Diff line number Diff line
@@ -18,22 +18,6 @@ 
#define __ODM_INTERFACE_H__







/*  */

/*  =========== Constant/Structure/Enum/... Define */

/*  */







/*  */

/*  =========== Macro Define */

/*  */



#define _reg_all(_name)			ODM_##_name

#define _reg_ic(_name, _ic)		ODM_##_name##_ic

#define _bit_all(_name)			BIT_##_name

#define _bit_ic(_name, _ic)		BIT_##_name##_ic



/*  _cat: implemented by Token-Pasting Operator. */



/*===================================
@@ -67,57 +51,24 @@ ODM_REG(DIG,_pDM_Odm) 
/*  */

typedef void (*RT_WORKITEM_CALL_BACK)(struct work_struct *pContext);



/*  */

/*  =========== Extern Variable ??? It should be forbidden. */

/*  */





/*  */

/*  =========== EXtern Function Prototype */

/*  */





u8 ODM_Read1Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr);



u16 ODM_Read2Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr);



u32 ODM_Read4Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr);



void ODM_Write1Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr, u8 Data);



void ODM_Write2Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr, u16 Data);



void ODM_Write4Byte(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 Data);



void ODM_SetMACReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data);



u32 ODM_GetMACReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask);



void ODM_SetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask, u32 Data);



u32 ODM_GetBBReg(struct dm_odm_t *pDM_Odm, u32 RegAddr, u32 BitMask);



void ODM_SetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,

		  u32 RegAddr, u32 BitMask, u32 Data);



u32 ODM_GetRFReg(struct dm_odm_t *pDM_Odm, enum RF_RADIO_PATH eRFPath,

		 u32 RegAddr, u32 BitMask);



/*  Memory Relative Function. */

s32 ODM_CompareMemory(struct dm_odm_t *pDM_Odm, void *pBuf1, void *pBuf2, u32 length);



/*  ODM MISC-workitem relative API. */

void ODM_InitializeWorkItem(struct dm_odm_t *pDM_Odm, void *pRtWorkItem,

			    RT_WORKITEM_CALL_BACK RtWorkItemCallback, void *pContext, const char *szID);



/*  ODM Timer relative API. */

void ODM_SetTimer(struct dm_odm_t *pDM_Odm, struct timer_list *pTimer, u32 msDelay);



void ODM_ReleaseTimer(struct dm_odm_t *pDM_Odm, struct timer_list *pTimer);



/*  ODM FW relative API. */

u32 ODM_FillH2CCmd(u8 *pH2CBuffer, u32 H2CBufferLen, u32 CmdNum,

		   u32 *pElementID, u32 *pCmdLen, u8 **pCmbBuffer,

		   u8 *CmdStartSeq);



#endif	/*  __ODM_INTERFACE_H__ */