Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e848068 authored Feb 06, 2014 by Larry Finger Committed by Greg Kroah-Hartman Feb 07, 2014

staging: r8188eu: Remove ODM_CompareMemory



This routine is a wrapper for _rtw_memcmp(), which is a wrapper for memcmp.
In a later change, _rtw_memcmp will be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9b4a2b7e

drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -217,7 +217,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(

	for (i = 0; i < CCK_TABLE_SIZE; i++) {		for (i = 0; i < CCK_TABLE_SIZE; i++) {
	if (dm_odm->RFCalibrateInfo.bCCKinCH14) {		if (dm_odm->RFCalibrateInfo.bCCKinCH14) {
	if (ODM_CompareMemory(dm_odm, (void )&TempCCk, (void )&CCKSwingTable_Ch14[i][2], 4) == 0) {		if (_rtw_memcmp((void )&TempCCk, (void )&CCKSwingTable_Ch14[i][2], 4) == 0) {
	CCK_index_old = (u8)i;		CCK_index_old = (u8)i;
	dm_odm->BbSwingIdxCckBase = (u8)i;		dm_odm->BbSwingIdxCckBase = (u8)i;
	ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,		ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
	@@ -229,7 +229,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
	ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,		ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
	("RegA24: 0x%X, CCKSwingTable_Ch1_Ch13[%d][2]: CCKSwingTable_Ch1_Ch13[i][2]: 0x%X\n",		("RegA24: 0x%X, CCKSwingTable_Ch1_Ch13[%d][2]: CCKSwingTable_Ch1_Ch13[i][2]: 0x%X\n",
	TempCCk, i, CCKSwingTable_Ch1_Ch13[i][2]));		TempCCk, i, CCKSwingTable_Ch1_Ch13[i][2]));
	if (ODM_CompareMemory(dm_odm, (void )&TempCCk, (void )&CCKSwingTable_Ch1_Ch13[i][2], 4) == 0) {		if (_rtw_memcmp((void )&TempCCk, (void )&CCKSwingTable_Ch1_Ch13[i][2], 4) == 0) {
	CCK_index_old = (u8)i;		CCK_index_old = (u8)i;
	dm_odm->BbSwingIdxCckBase = (u8)i;		dm_odm->BbSwingIdxCckBase = (u8)i;
	ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,		ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,

drivers/staging/rtl8188eu/hal/odm_interface.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,6 @@

	#include "odm_precomp.h"		#include "odm_precomp.h"

	s32 ODM_CompareMemory(struct odm_dm_struct pDM_Odm, void pBuf1, void *pBuf2, u32 length)
	{
	return _rtw_memcmp(pBuf1, pBuf2, length);
	}

	void ODM_SetTimer(struct odm_dm_struct pDM_Odm, struct timer_list pTimer, u32 msDelay)		void ODM_SetTimer(struct odm_dm_struct pDM_Odm, struct timer_list pTimer, u32 msDelay)
	{		{
	_set_timer(pTimer, msDelay); /* ms */		_set_timer(pTimer, msDelay); /* ms */

drivers/staging/rtl8188eu/include/odm_interface.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -79,9 +79,6 @@ typedef void (RT_WORKITEM_CALL_BACK)(void pContext);

	/* Memory Relative Function. */		/* Memory Relative Function. */

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

	/* ODM Timer relative API. */		/* ODM Timer relative API. */
	void ODM_SetTimer(struct odm_dm_struct pDM_Odm, struct timer_list pTimer,		void ODM_SetTimer(struct odm_dm_struct pDM_Odm, struct timer_list pTimer,
	u32 msDelay);		u32 msDelay);