staging: csr: remove CsrMemCmp

It's really just memcmp(), so call that instead.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index 7b9afeb4eb8f2b2d8c8bc1512fbf6b7d4ca2f360..0b7b63226ead079a58c3e7ac924cf5863b88cb9b 100644 (file)
--- a/drivers/staging/csr/csr_util.c
+++ b/drivers/staging/csr/csr_util.c
@@ -48,12 +48,6 @@ void *CsrMemMove(void *dest, const void *src, size_t count)
     return memmove(dest, src, count);
 }
 EXPORT_SYMBOL_GPL(CsrMemMove);
-
-s32 CsrMemCmp(const void *buf1, const void *buf2, size_t count)
-{
-    return memcmp(buf1, buf2, count);
-}
-EXPORT_SYMBOL_GPL(CsrMemCmp);
 #endif
 
 #ifndef CSR_USE_STDC_LIB

diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index a32db1757e10a7649e22584369c41152d9dcbdbf..f04671291d436b0e463f45b9611e451533262e66 100644 (file)
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -31,7 +31,6 @@ void CsrUInt16ToHex(u16 number, char *str);
 #define CsrMemMove memmove
 #define CsrStrCpy strcpy
 #define CsrStrNCpy strncpy
-#define CsrMemCmp(s1, s2, n) ((s32) memcmp((s1), (s2), (n)))
 #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
 #define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n)))
 #define CsrStrChr strchr
@@ -41,7 +40,6 @@ void *CsrMemCpy(void *dest, const void *src, size_t count);
 void *CsrMemMove(void *dest, const void *src, size_t count);
 char *CsrStrCpy(char *dest, const char *src);
 char *CsrStrNCpy(char *dest, const char *src, size_t count);
-s32 CsrMemCmp(const void *buf1, const void *buf2, size_t count);
 s32 CsrStrCmp(const char *string1, const char *string2);
 s32 CsrStrNCmp(const char *string1, const char *string2, size_t count);
 char *CsrStrChr(const char *string, char c);

diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c
index 33fc315473689b429dde5703bffe8fad2c9d2669..f1df36aa87e7866fa112127f2ed288221529fc2c 100644 (file)
--- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c
+++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c
@@ -257,7 +257,7 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl
     else if (tad->packet_filter & CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET)
     {
         /* detect Aironet frames */
-        if (!CsrMemCmp(data->os_data_ptr + 3, aironet_snap, 5))
+        if (!memcmp(data->os_data_ptr + 3, aironet_snap, 5))
         {
             UNIFI_MAC_ADDRESS_COPY(srcAddress.a, saddr);
             unifi_ta_indicate_protocol(card->ospriv, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET,