diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 14:18:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 14:18:02 -0700 |
| commit | 85a334e3ce9cc94ab02968882ba7235237c7920d (patch) | |
| tree | a1cae2f862259b106cd8406502b00d04ccdf646b /drivers/staging | |
| parent | staging: csr: remove CsrMemSet (diff) | |
| download | linux-dev-85a334e3ce9cc94ab02968882ba7235237c7920d.tar.xz linux-dev-85a334e3ce9cc94ab02968882ba7235237c7920d.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/csr/csr_util.c | 6 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_util.h | 2 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_ta_sampling.c | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index 7b9afeb4eb8f..0b7b63226ead 100644 --- 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 a32db1757e10..f04671291d43 100644 --- 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 33fc31547368..f1df36aa87e7 100644 --- 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, |