staging: csr: remove CsrMemCpy()

It was just a wrapper around memcpy() 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>

15 files changed, 77 insertions, 97 deletions

diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index 1d84938bbb4d..dfb89f1f9fab 100644
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -42,7 +42,7 @@ EXPORT_SYMBOL_GPL(CsrUint32Des);
 
 void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length)
 {
-    CsrMemCpy(value, &buffer[*offset], length);
+    memcpy(value, &buffer[*offset], length);
     *offset += length;
 }
 EXPORT_SYMBOL_GPL(CsrMemCpyDes);
@@ -114,7 +114,7 @@ EXPORT_SYMBOL_GPL(CsrUint32Ser);
 
 void CsrMemCpySer(u8 *buffer, size_t *offset, const void *value, size_t length)
 {
-    CsrMemCpy(&buffer[*offset], value, length);
+    memcpy(&buffer[*offset], value, length);
     *offset += length;
 }
 EXPORT_SYMBOL_GPL(CsrMemCpySer);
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index edfc4b718db5..682efa909947 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -151,7 +151,7 @@ u32 CsrUtf16StringToUint32(const u16 *unicodeString)
 *********************************************************************************/
 u16 *CsrUtf16MemCpy(u16 *dest, const u16 *src, u32 count)
 {
-    return CsrMemCpy((u8 *) dest, (u8 *) src, count * sizeof(u16));
+    return memcpy((u8 *) dest, (u8 *) src, count * sizeof(u16));
 }
 
 /********************************************************************************
@@ -706,7 +706,7 @@ u16 *CsrUtf16StrCpy(u16 *target, const u16 *source)
 {
     if (source) /* if source is not NULL*/
     {
-        CsrMemCpy(target, source, (CsrUtf16StrLen(source) + 1) * sizeof(u16));
+        memcpy(target, source, (CsrUtf16StrLen(source) + 1) * sizeof(u16));
         return target;
     }
     else
@@ -736,7 +736,7 @@ u16 *CsrUtf16StringDuplicate(const u16 *source)
     {
         length = (CsrUtf16StrLen(source) + 1) * sizeof(u16);
         target = (u16 *) CsrPmemAlloc(length);
-        CsrMemCpy(target, source, length);
+        memcpy(target, source, length);
     }
     return target;
 }
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c
index c3db3ee71b89..ae2e1dcbfd4d 100644
--- a/drivers/staging/csr/csr_util.c
+++ b/drivers/staging/csr/csr_util.c
@@ -33,17 +33,6 @@ void CsrUInt16ToHex(u16 number, char *str)
     str[4] = '\0';
 }
 
-/*------------------------------------------------------------------*/
-/*  String */
-/*------------------------------------------------------------------*/
-#ifndef CSR_USE_STDC_LIB
-void *CsrMemCpy(void *dest, const void *src, size_t count)
-{
-    return memcpy(dest, src, count);
-}
-EXPORT_SYMBOL_GPL(CsrMemCpy);
-#endif
-
 MODULE_DESCRIPTION("CSR Operating System Kernel Abstraction");
 MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");
 MODULE_LICENSE("GPL and additional rights");
diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h
index fb5f05e75c25..d60d8df3b89b 100644
--- a/drivers/staging/csr/csr_util.h
+++ b/drivers/staging/csr/csr_util.h
@@ -23,15 +23,6 @@ extern "C" {
 /*------------------------------------------------------------------*/
 void CsrUInt16ToHex(u16 number, char *str);
 
-/*------------------------------------------------------------------*/
-/* Standard C Library functions */
-/*------------------------------------------------------------------*/
-#ifdef CSR_USE_STDC_LIB
-#define CsrMemCpy memcpy
-#else /* !CSR_USE_STDC_LIB */
-void *CsrMemCpy(void *dest, const void *src, size_t count);
-#endif /* !CSR_USE_STDC_LIB */
-
 #define CsrOffsetOf(st, m)  ((size_t) & ((st *) 0)->m)
 
 #ifdef __cplusplus
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
index a111d40f3e34..6536cb35cf61 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
@@ -1750,7 +1750,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr,
             return -1;
         }
 
-        CsrMemCpy((void *)host_bulk_data_slot,
+        memcpy((void *)host_bulk_data_slot,
                   (void *)(bdslot->os_data_ptr + offset), len);
 
         r = unifi_bulk_rw(card,
@@ -2104,7 +2104,7 @@ static CsrResult process_fh_cmd_queue(card_t *card, s32 *processed)
         card->fh_buffer.ptr[1] =
             (u8)(((signal_length >> 8) & 0xf) | (SDIO_CMD_SIGNAL << 4));
 
-        CsrMemCpy(card->fh_buffer.ptr + 2, packed_sigptr, signal_length);
+        memcpy(card->fh_buffer.ptr + 2, packed_sigptr, signal_length);
         memset(card->fh_buffer.ptr + 2 + signal_length, 0,
                   total_length - (2 + signal_length));
 
@@ -2382,7 +2382,7 @@ static CsrResult process_fh_traffic_queue(card_t *card, s32 *processed)
         card->fh_buffer.ptr[1] =
             (u8)(((signal_length >> 8) & 0xf) | (SDIO_CMD_SIGNAL << 4));
 
-        CsrMemCpy(card->fh_buffer.ptr + 2, packed_sigptr, signal_length);
+        memcpy(card->fh_buffer.ptr + 2, packed_sigptr, signal_length);
         memset(card->fh_buffer.ptr + 2 + signal_length, 0,
                   total_length - (2 + signal_length));
 
diff --git a/drivers/staging/csr/csr_wifi_hip_packing.c b/drivers/staging/csr/csr_wifi_hip_packing.c
index c01bb1372eba..0768aefc6d1f 100644
--- a/drivers/staging/csr/csr_wifi_hip_packing.c
+++ b/drivers/staging/csr/csr_wifi_hip_packing.c
@@ -1321,7 +1321,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeStopAggregationConfirm.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeStopAggregationConfirm.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeStopAggregationConfirm.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeStopAggregationConfirm.UserPriority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -1428,7 +1428,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MaPacketIndication.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MaPacketIndication.LocalTime.x, &ptr[index], 64 / 8);
+            memcpy(sig->u.MaPacketIndication.LocalTime.x, &ptr[index], 64 / 8);
             index += 64 / 8;
             sig->u.MaPacketIndication.Ifindex = (CSR_IFINTERFACE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -1473,7 +1473,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeConnectedIndication.ConnectionStatus = (CSR_CONNECTION_STATUS) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeConnectedIndication.PeerMacAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeConnectedIndication.PeerMacAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -1593,7 +1593,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeStartAggregationRequest.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeStartAggregationRequest.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeStartAggregationRequest.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeStartAggregationRequest.UserPriority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -1617,7 +1617,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeHlSyncRequest.Dummydataref2.DataLength = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeHlSyncRequest.GroupAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeHlSyncRequest.GroupAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -1705,7 +1705,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeResetRequest.Dummydataref2.DataLength = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeResetRequest.StaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeResetRequest.StaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeResetRequest.SetDefaultMib = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -1793,7 +1793,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeConnectStatusRequest.ConnectionStatus = (CSR_CONNECTION_STATUS) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeConnectStatusRequest.StaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeConnectStatusRequest.StaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeConnectStatusRequest.AssociationId = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2010,7 +2010,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT32;
             sig->u.MaPacketRequest.Priority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MaPacketRequest.Ra.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MaPacketRequest.Ra.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MaPacketRequest.TransmissionControl = (CSR_TRANSMISSION_CONTROL) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2033,7 +2033,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeModifyBssParameterRequest.CapabilityInformation = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeModifyBssParameterRequest.Bssid.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeModifyBssParameterRequest.Bssid.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeModifyBssParameterRequest.RtsThreshold = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2081,7 +2081,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeHlSyncCancelRequest.Dummydataref2.DataLength = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeHlSyncCancelRequest.GroupAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeHlSyncCancelRequest.GroupAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -2151,7 +2151,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeGetKeySequenceRequest.KeyType = (CSR_KEY_TYPE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeGetKeySequenceRequest.Address.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeGetKeySequenceRequest.Address.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -2171,7 +2171,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeSetChannelRequest.Channel = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeSetChannelRequest.Address.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeSetChannelRequest.Address.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeSetChannelRequest.AvailabilityDuration = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2223,7 +2223,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeAutonomousScanLossIndication.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeAutonomousScanLossIndication.Bssid.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeAutonomousScanLossIndication.Bssid.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -2337,7 +2337,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeStopAggregationRequest.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeStopAggregationRequest.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeStopAggregationRequest.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeStopAggregationRequest.UserPriority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2387,7 +2387,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT32;
             sig->u.MlmeAddBlackoutRequest.BlackoutDuration = CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT32;
-            CsrMemCpy(sig->u.MlmeAddBlackoutRequest.PeerStaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeAddBlackoutRequest.PeerStaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeAddBlackoutRequest.BlackoutCount = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2409,7 +2409,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeDeletekeysRequest.KeyType = (CSR_KEY_TYPE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeDeletekeysRequest.Address.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeDeletekeysRequest.Address.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -2437,7 +2437,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeHlSyncConfirm.Dummydataref2.DataLength = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeHlSyncConfirm.GroupAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeHlSyncConfirm.GroupAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeHlSyncConfirm.ResultCode = (CSR_RESULT_CODE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2499,9 +2499,9 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeSmStartRequest.Channel = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeSmStartRequest.InterfaceAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeSmStartRequest.InterfaceAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
-            CsrMemCpy(sig->u.MlmeSmStartRequest.Bssid.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeSmStartRequest.Bssid.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeSmStartRequest.BeaconPeriod = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2579,7 +2579,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeSetkeysRequest.KeyType = (CSR_KEY_TYPE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeSetkeysRequest.Address.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeSetkeysRequest.Address.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeSetkeysRequest.SequenceNumber[0] = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2597,7 +2597,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeSetkeysRequest.SequenceNumber[7] = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(&sig->u.MlmeSetkeysRequest.CipherSuiteSelector, &ptr[index], 32 / 8);
+            memcpy(&sig->u.MlmeSetkeysRequest.CipherSuiteSelector, &ptr[index], 32 / 8);
             index += 32 / 8;
             break;
 #endif
@@ -2664,7 +2664,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MaPacketErrorIndication.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MaPacketErrorIndication.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MaPacketErrorIndication.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MaPacketErrorIndication.UserPriority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -2829,7 +2829,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeBlockackErrorIndication.ResultCode = (CSR_REASON_CODE) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeBlockackErrorIndication.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeBlockackErrorIndication.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -2875,7 +2875,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig)
             index += SIZEOF_UINT16;
             sig->u.MlmeStartAggregationConfirm.VirtualInterfaceIdentifier = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(sig->u.MlmeStartAggregationConfirm.PeerQstaAddress.x, &ptr[index], 48 / 8);
+            memcpy(sig->u.MlmeStartAggregationConfirm.PeerQstaAddress.x, &ptr[index], 48 / 8);
             index += 48 / 8;
             sig->u.MlmeStartAggregationConfirm.UserPriority = (CSR_PRIORITY) CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr + index);
             index += SIZEOF_UINT16;
@@ -3157,7 +3157,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStopAggregationConfirm.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeStopAggregationConfirm.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeStopAggregationConfirm.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStopAggregationConfirm.UserPriority, ptr + index);
             index += SIZEOF_UINT16;
@@ -3264,7 +3264,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketIndication.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MaPacketIndication.LocalTime.x, 64 / 8);
+            memcpy(ptr + index, sig->u.MaPacketIndication.LocalTime.x, 64 / 8);
             index += 64 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketIndication.Ifindex, ptr + index);
             index += SIZEOF_UINT16;
@@ -3309,7 +3309,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeConnectedIndication.ConnectionStatus, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeConnectedIndication.PeerMacAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeConnectedIndication.PeerMacAddress.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -3429,7 +3429,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStartAggregationRequest.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeStartAggregationRequest.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeStartAggregationRequest.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStartAggregationRequest.UserPriority, ptr + index);
             index += SIZEOF_UINT16;
@@ -3453,7 +3453,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeHlSyncRequest.Dummydataref2.DataLength, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeHlSyncRequest.GroupAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeHlSyncRequest.GroupAddress.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -3541,7 +3541,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeResetRequest.Dummydataref2.DataLength, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeResetRequest.StaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeResetRequest.StaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeResetRequest.SetDefaultMib, ptr + index);
             index += SIZEOF_UINT16;
@@ -3629,7 +3629,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeConnectStatusRequest.ConnectionStatus, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeConnectStatusRequest.StaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeConnectStatusRequest.StaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeConnectStatusRequest.AssociationId, ptr + index);
             index += SIZEOF_UINT16;
@@ -3846,7 +3846,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT32;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketRequest.Priority, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MaPacketRequest.Ra.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MaPacketRequest.Ra.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketRequest.TransmissionControl, ptr + index);
             index += SIZEOF_UINT16;
@@ -3869,7 +3869,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeModifyBssParameterRequest.CapabilityInformation, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeModifyBssParameterRequest.Bssid.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeModifyBssParameterRequest.Bssid.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeModifyBssParameterRequest.RtsThreshold, ptr + index);
             index += SIZEOF_UINT16;
@@ -3917,7 +3917,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeHlSyncCancelRequest.Dummydataref2.DataLength, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeHlSyncCancelRequest.GroupAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeHlSyncCancelRequest.GroupAddress.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -3987,7 +3987,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeGetKeySequenceRequest.KeyType, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeGetKeySequenceRequest.Address.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeGetKeySequenceRequest.Address.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -4007,7 +4007,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSetChannelRequest.Channel, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeSetChannelRequest.Address.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeSetChannelRequest.Address.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSetChannelRequest.AvailabilityDuration, ptr + index);
             index += SIZEOF_UINT16;
@@ -4059,7 +4059,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeAutonomousScanLossIndication.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeAutonomousScanLossIndication.Bssid.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeAutonomousScanLossIndication.Bssid.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -4173,7 +4173,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStopAggregationRequest.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeStopAggregationRequest.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeStopAggregationRequest.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStopAggregationRequest.UserPriority, ptr + index);
             index += SIZEOF_UINT16;
@@ -4223,7 +4223,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT32;
             CSR_COPY_UINT32_TO_LITTLE_ENDIAN(sig->u.MlmeAddBlackoutRequest.BlackoutDuration, ptr + index);
             index += SIZEOF_UINT32;
-            CsrMemCpy(ptr + index, sig->u.MlmeAddBlackoutRequest.PeerStaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeAddBlackoutRequest.PeerStaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeAddBlackoutRequest.BlackoutCount, ptr + index);
             index += SIZEOF_UINT16;
@@ -4245,7 +4245,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeDeletekeysRequest.KeyType, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeDeletekeysRequest.Address.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeDeletekeysRequest.Address.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -4273,7 +4273,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeHlSyncConfirm.Dummydataref2.DataLength, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeHlSyncConfirm.GroupAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeHlSyncConfirm.GroupAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeHlSyncConfirm.ResultCode, ptr + index);
             index += SIZEOF_UINT16;
@@ -4335,9 +4335,9 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSmStartRequest.Channel, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeSmStartRequest.InterfaceAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeSmStartRequest.InterfaceAddress.x, 48 / 8);
             index += 48 / 8;
-            CsrMemCpy(ptr + index, sig->u.MlmeSmStartRequest.Bssid.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeSmStartRequest.Bssid.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSmStartRequest.BeaconPeriod, ptr + index);
             index += SIZEOF_UINT16;
@@ -4415,7 +4415,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSetkeysRequest.KeyType, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeSetkeysRequest.Address.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeSetkeysRequest.Address.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSetkeysRequest.SequenceNumber[0], ptr + index);
             index += SIZEOF_UINT16;
@@ -4433,7 +4433,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeSetkeysRequest.SequenceNumber[7], ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, &sig->u.MlmeSetkeysRequest.CipherSuiteSelector, 32 / 8);
+            memcpy(ptr + index, &sig->u.MlmeSetkeysRequest.CipherSuiteSelector, 32 / 8);
             index += 32 / 8;
             break;
 #endif
@@ -4500,7 +4500,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketErrorIndication.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MaPacketErrorIndication.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MaPacketErrorIndication.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MaPacketErrorIndication.UserPriority, ptr + index);
             index += SIZEOF_UINT16;
@@ -4665,7 +4665,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeBlockackErrorIndication.ResultCode, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeBlockackErrorIndication.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeBlockackErrorIndication.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             break;
 #endif
@@ -4711,7 +4711,7 @@ CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len)
             index += SIZEOF_UINT16;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStartAggregationConfirm.VirtualInterfaceIdentifier, ptr + index);
             index += SIZEOF_UINT16;
-            CsrMemCpy(ptr + index, sig->u.MlmeStartAggregationConfirm.PeerQstaAddress.x, 48 / 8);
+            memcpy(ptr + index, sig->u.MlmeStartAggregationConfirm.PeerQstaAddress.x, 48 / 8);
             index += 48 / 8;
             CSR_COPY_UINT16_TO_LITTLE_ENDIAN(sig->u.MlmeStartAggregationConfirm.UserPriority, ptr + index);
             index += SIZEOF_UINT16;
diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c
index 88b5e341d765..684d30459d75 100644
--- a/drivers/staging/csr/csr_wifi_hip_send.c
+++ b/drivers/staging/csr/csr_wifi_hip_send.c
@@ -129,7 +129,7 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen,
 
     /* Make up the card_signal struct */
     csptr->signal_length = (u16)siglen;
-    CsrMemCpy((void *)csptr->sigbuf, (void *)sigptr, siglen);
+    memcpy((void *)csptr->sigbuf, (void *)sigptr, siglen);
 
     for (i = 0; i < UNIFI_MAX_DATA_REFERENCES; ++i)
     {
diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c
index e841306adb1a..c503365581ff 100644
--- a/drivers/staging/csr/csr_wifi_hip_xbv.c
+++ b/drivers/staging/csr/csr_wifi_hip_xbv.c
@@ -522,7 +522,7 @@ static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
     }
 
     /* get section tag */
-    CsrMemCpy(tag->t_name, buf, 4);
+    memcpy(tag->t_name, buf, 4);
 
     /* get section length */
     tag->t_len = xbv2uint(buf + 4, 4);
@@ -601,7 +601,7 @@ static u32 write_bytes(void *buf, const u32 offset, const u8 *data, const u32 le
 static u32 write_tag(void *buf, const u32 offset, const char *tag_str)
 {
     u8 *dst = (u8 *)buf + offset;
-    CsrMemCpy(dst, tag_str, 4);
+    memcpy(dst, tag_str, 4);
     return 4;
 }
 
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index b7ebfe48dc3a..a07511e52c34 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -404,8 +404,8 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
 #define CsrWifiNmeApWmmParamUpdateReqCreate(msg__, dst__, src__, wmmApParams__, wmmApBcParams__) \
     msg__ = (CsrWifiNmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateReq)); \
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \
-    CsrMemCpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
-    CsrMemCpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4);
+    memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
+    memcpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4);
 
 #define CsrWifiNmeApWmmParamUpdateReqSendTo(dst__, src__, wmmApParams__, wmmApBcParams__) \
     { \
@@ -474,7 +474,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
     msg__->interfaceTag = (interfaceTag__); \
     msg__->selectedDevicePasswordId = (selectedDevicePasswordId__); \
     msg__->selectedConfigMethod = (selectedConfigMethod__); \
-    CsrMemCpy(msg__->pin, (pin__), sizeof(u8) * 8);
+    memcpy(msg__->pin, (pin__), sizeof(u8) * 8);
 
 #define CsrWifiNmeApWpsRegisterReqSendTo(dst__, src__, interfaceTag__, selectedDevicePasswordId__, selectedConfigMethod__, pin__) \
     { \
diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index 4ec7b946bd1a..32ae9bfa9fd1 100644
--- a/drivers/staging/csr/csr_wifi_nme_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -789,8 +789,8 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
 #define CsrWifiNmeSimUmtsAuthIndCreate(msg__, dst__, src__, rand__, autn__) \
     msg__ = (CsrWifiNmeSimUmtsAuthInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimUmtsAuthInd)); \
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_IND, dst__, src__); \
-    CsrMemCpy(msg__->rand, (rand__), sizeof(u8) * 16); \
-    CsrMemCpy(msg__->autn, (autn__), sizeof(u8) * 16);
+    memcpy(msg__->rand, (rand__), sizeof(u8) * 16); \
+    memcpy(msg__->autn, (autn__), sizeof(u8) * 16);
 
 #define CsrWifiNmeSimUmtsAuthIndSendTo(dst__, src__, rand__, autn__) \
     { \
@@ -838,11 +838,11 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_RES, dst__, src__); \
     msg__->status = (status__); \
     msg__->result = (result__); \
-    CsrMemCpy(msg__->umtsCipherKey, (umtsCipherKey__), sizeof(u8) * 16); \
-    CsrMemCpy(msg__->umtsIntegrityKey, (umtsIntegrityKey__), sizeof(u8) * 16); \
+    memcpy(msg__->umtsCipherKey, (umtsCipherKey__), sizeof(u8) * 16); \
+    memcpy(msg__->umtsIntegrityKey, (umtsIntegrityKey__), sizeof(u8) * 16); \
     msg__->resParameterLength = (resParameterLength__); \
     msg__->resParameter = (resParameter__); \
-    CsrMemCpy(msg__->auts, (auts__), sizeof(u8) * 14);
+    memcpy(msg__->auts, (auts__), sizeof(u8) * 14);
 
 #define CsrWifiNmeSimUmtsAuthResSendTo(dst__, src__, status__, result__, umtsCipherKey__, umtsIntegrityKey__, resParameterLength__, resParameter__, auts__) \
     { \
@@ -1033,7 +1033,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
     msg__ = (CsrWifiNmeWpsReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsReq)); \
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_REQ, dst__, src__); \
     msg__->interfaceTag = (interfaceTag__); \
-    CsrMemCpy(msg__->pin, (pin__), sizeof(u8) * 8); \
+    memcpy(msg__->pin, (pin__), sizeof(u8) * 8); \
     msg__->ssid = (ssid__); \
     msg__->bssid = (bssid__);
 
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index df9dd9bf6007..97d675a7a6c5 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -2042,7 +2042,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
     msg__->clientData = (clientData__); \
     msg__->status = (status__); \
     msg__->numInterfaceAddress = (numInterfaceAddress__); \
-    CsrMemCpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2); \
+    memcpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2); \
     msg__->smeVersions = (smeVersions__); \
     msg__->scheduledInterrupt = (scheduledInterrupt__);
 
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
index 22a3419b1b1c..06a6f32845fa 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -524,7 +524,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
     msg__->secIeLength = (secIeLength__); \
     msg__->secIe = (secIe__); \
     msg__->groupKeyId = (groupKeyId__); \
-    CsrMemCpy(msg__->seqNumber, (seqNumber__), sizeof(u16) * 8);
+    memcpy(msg__->seqNumber, (seqNumber__), sizeof(u16) * 8);
 
 #define CsrWifiSmeApStaNotifyIndSendTo(dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__, disassocReason__, deauthReason__, WpsRegistration__, secIeLength__, secIe__, groupKeyId__, seqNumber__) \
     { \
@@ -556,8 +556,8 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
     msg__ = (CsrWifiSmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWmmParamUpdateReq)); \
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \
     msg__->interfaceTag = (interfaceTag__); \
-    CsrMemCpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
-    CsrMemCpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4);
+    memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
+    memcpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4);
 
 #define CsrWifiSmeApWmmParamUpdateReqSendTo(dst__, src__, interfaceTag__, wmmApParams__, wmmApBcParams__) \
     { \
diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index f320bd43e1d5..5b1b8638d8ce 100644
--- a/drivers/staging/csr/csr_wifi_sme_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -1808,7 +1808,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_CFM, dst__, src__); \
     msg__->status = (status__); \
     msg__->numInterfaces = (numInterfaces__); \
-    CsrMemCpy(msg__->capBitmap, (capBitmap__), sizeof(u8) * 2);
+    memcpy(msg__->capBitmap, (capBitmap__), sizeof(u8) * 2);
 
 #define CsrWifiSmeInterfaceCapabilityGetCfmSendTo(dst__, src__, status__, numInterfaces__, capBitmap__) \
     { \
@@ -3751,7 +3751,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
     msg__ = (CsrWifiSmeStationMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetCfm)); \
     CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_CFM, dst__, src__); \
     msg__->status = (status__); \
-    CsrMemCpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2);
+    memcpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2);
 
 #define CsrWifiSmeStationMacAddressGetCfmSendTo(dst__, src__, status__, stationMacAddress__) \
     { \
diff --git a/drivers/staging/csr/sme_mgt.c b/drivers/staging/csr/sme_mgt.c
index 28295ef9b970..e252883d70eb 100644
--- a/drivers/staging/csr/sme_mgt.c
+++ b/drivers/staging/csr/sme_mgt.c
@@ -149,7 +149,7 @@ void CsrWifiSmeScanResultsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg)
     for (i = 0; i < cfm->scanResultsCount; ++i)
     {
         CsrWifiSmeScanResult *scan_result = &scanCopy[i];
-        CsrMemCpy(current_buff, scan_result->informationElements, scan_result->informationElementsLength);
+        memcpy(current_buff, scan_result->informationElements, scan_result->informationElementsLength);
         scan_result->informationElements = current_buff;
         current_buff += scan_result->informationElementsLength;
     }
diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c
index 2fe7b576a0e0..51d679234a52 100644
--- a/drivers/staging/csr/unifi_sme.c
+++ b/drivers/staging/csr/unifi_sme.c
@@ -130,7 +130,7 @@ sme_log_event(ul_client_t *pcli,
             raddr = macHdrLocation + MAC_HEADER_ADDR1_OFFSET;
             taddr = macHdrLocation + MAC_HEADER_ADDR2_OFFSET;
 
-            CsrMemCpy(peerMacAddress.a, taddr, ETH_ALEN);
+            memcpy(peerMacAddress.a, taddr, ETH_ALEN);
 
             if(ind->ReceptionStatus == CSR_MICHAEL_MIC_ERROR)
             {
@@ -1218,7 +1218,7 @@ void uf_send_pkt_to_encrypt(struct work_struct *work)
 
         spin_lock_irqsave(&priv->wapi_lock, flags);
         /* Copy over the MA PKT REQ bulk data */
-        CsrMemCpy(pktBulkData, (u8*)interfacePriv->wapi_unicast_bulk_data.os_data_ptr, pktBulkDataLength);
+        memcpy(pktBulkData, (u8*)interfacePriv->wapi_unicast_bulk_data.os_data_ptr, pktBulkDataLength);
         /* Free any bulk data buffers allocated for the WAPI Data pkt */
         unifi_net_data_free(priv, &interfacePriv->wapi_unicast_bulk_data);
         interfacePriv->wapi_unicast_bulk_data.net_buf_length = 0;