From: Larry Finger <Larry.Finger@lwfinger.net>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, netdev@vger.kernel.org,
Larry Finger <Larry.Finger@lwfinger.net>
Subject: [PATCH 10/12] staging: r8188eu: Remove ODM_CompareMemory
Date: Thu, 6 Feb 2014 20:45:45 -0600 [thread overview]
Message-ID: <1391741147-3047-11-git-send-email-Larry.Finger@lwfinger.net> (raw)
In-Reply-To: <1391741147-3047-1-git-send-email-Larry.Finger@lwfinger.net>
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>
---
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 4 ++--
drivers/staging/rtl8188eu/hal/odm_interface.c | 5 -----
drivers/staging/rtl8188eu/include/odm_interface.h | 3 ---
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
index 6af70ce..4b5caa1 100644
--- a/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
+++ b/drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c
@@ -217,7 +217,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
for (i = 0; i < CCK_TABLE_SIZE; i++) {
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;
dm_odm->BbSwingIdxCckBase = (u8)i;
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,
("RegA24: 0x%X, CCKSwingTable_Ch1_Ch13[%d][2]: CCKSwingTable_Ch1_Ch13[i][2]: 0x%X\n",
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;
dm_odm->BbSwingIdxCckBase = (u8)i;
ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
diff --git a/drivers/staging/rtl8188eu/hal/odm_interface.c b/drivers/staging/rtl8188eu/hal/odm_interface.c
index 0f5b32f..f6e8c1c 100644
--- a/drivers/staging/rtl8188eu/hal/odm_interface.c
+++ b/drivers/staging/rtl8188eu/hal/odm_interface.c
@@ -20,11 +20,6 @@
#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)
{
_set_timer(pTimer, msDelay); /* ms */
diff --git a/drivers/staging/rtl8188eu/include/odm_interface.h b/drivers/staging/rtl8188eu/include/odm_interface.h
index 8e07754..35de915 100644
--- a/drivers/staging/rtl8188eu/include/odm_interface.h
+++ b/drivers/staging/rtl8188eu/include/odm_interface.h
@@ -79,9 +79,6 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext);
/* Memory Relative Function. */
-s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2,
- u32 length);
-
/* ODM Timer relative API. */
void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,
u32 msDelay);
--
1.8.4.5
next prev parent reply other threads:[~2014-02-07 2:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-07 2:45 [PATCH 00/12] Remove several pointless wrapper routines Larry Finger
2014-02-07 2:45 ` [PATCH 01/12] staging: r8188eu: Remove ODM_Read1Byte Larry Finger
2014-02-07 2:45 ` [PATCH 02/12] staging: r8188eu: Remove ODM_Read2Byte Larry Finger
2014-02-07 2:45 ` [PATCH 03/12] staging: r8188eu: Remove ODM_Read4Byte Larry Finger
2014-02-07 2:45 ` [PATCH 04/12] staging: r8188eu: Remove ODM_Write1Byte Larry Finger
2014-02-07 2:45 ` [PATCH 05/12] staging: r8188eu: Remove ODM_Write2Byte Larry Finger
2014-02-07 2:45 ` [PATCH 06/12] staging: r8188eu: Remove ODM_Write4Byte Larry Finger
2014-02-07 2:45 ` [PATCH 07/12] staging: r8188eu: Remove wrappers around vmalloc and vzalloc Larry Finger
2014-02-07 2:45 ` [PATCH 08/12] staging: r8188eu: Remove wrappers around vfree Larry Finger
2014-02-07 2:45 ` [PATCH 09/12] staging: r8188eu: Remove ODM_AllocateMemory Larry Finger
2014-02-07 2:45 ` Larry Finger [this message]
2014-02-07 2:45 ` [PATCH 11/12] staging: r8188eu: Remove ODM_SetTimer Larry Finger
2014-02-07 2:45 ` [PATCH 12/12] staging: r8188eu: Remove ODM_InitializeTimer Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391741147-3047-11-git-send-email-Larry.Finger@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox