Commit 25aebdb1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bcb20f8

drivers/staging/csr/csr_serialize_primitive_types.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ EXPORT_SYMBOL_GPL(CsrUint32Des); 




void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length)

void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length)

{

{

    CsrMemCpy(value, &buffer[*offset], length);

    memcpy(value, &buffer[*offset], length);

    *offset += length;

    *offset += length;

}

}

EXPORT_SYMBOL_GPL(CsrMemCpyDes);

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)

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;

    *offset += length;

}

}

EXPORT_SYMBOL_GPL(CsrMemCpySer);

EXPORT_SYMBOL_GPL(CsrMemCpySer);

drivers/staging/csr/csr_utf16.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ u32 CsrUtf16StringToUint32(const u16 *unicodeString) 
*********************************************************************************/

*********************************************************************************/

u16 *CsrUtf16MemCpy(u16 *dest, const u16 *src, u32 count)

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*/

    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;

        return target;

    }

    }

    else

    else
@@ -736,7 +736,7 @@ u16 *CsrUtf16StringDuplicate(const u16 *source) 
    {

    {

        length = (CsrUtf16StrLen(source) + 1) * sizeof(u16);

        length = (CsrUtf16StrLen(source) + 1) * sizeof(u16);

        target = (u16 *) CsrPmemAlloc(length);

        target = (u16 *) CsrPmemAlloc(length);

        CsrMemCpy(target, source, length);

        memcpy(target, source, length);

    }

    }

    return target;

    return target;

}

}

drivers/staging/csr/csr_util.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -33,17 +33,6 @@ void CsrUInt16ToHex(u16 number, char *str) 
    str[4] = '\0';

    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_DESCRIPTION("CSR Operating System Kernel Abstraction");

MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");

MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");

MODULE_LICENSE("GPL and additional rights");
 
MODULE_LICENSE("GPL and additional rights");

drivers/staging/csr/csr_util.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -23,15 +23,6 @@ extern "C" { 
/*------------------------------------------------------------------*/

/*------------------------------------------------------------------*/

void CsrUInt16ToHex(u16 number, char *str);

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)

#define CsrOffsetOf(st, m)  ((size_t) & ((st *) 0)->m)





#ifdef __cplusplus

#ifdef __cplusplus

drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1750,7 +1750,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, 
            return -1;

            return -1;

        }

        }





        CsrMemCpy((void *)host_bulk_data_slot,

        memcpy((void *)host_bulk_data_slot,

                  (void *)(bdslot->os_data_ptr + offset), len);

                  (void *)(bdslot->os_data_ptr + offset), len);





        r = unifi_bulk_rw(card,

        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] =

        card->fh_buffer.ptr[1] =

            (u8)(((signal_length >> 8) & 0xf) | (SDIO_CMD_SIGNAL << 4));

            (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,

        memset(card->fh_buffer.ptr + 2 + signal_length, 0,

                  total_length - (2 + signal_length));

                  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] =

        card->fh_buffer.ptr[1] =

            (u8)(((signal_length >> 8) & 0xf) | (SDIO_CMD_SIGNAL << 4));

            (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,

        memset(card->fh_buffer.ptr + 2 + signal_length, 0,

                  total_length - (2 + signal_length));

                  total_length - (2 + signal_length));

CRA Git | Maintained and supported by SUSTech CRA and CCSE