Commit 4bcb20f8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: csr: remove CsrStrLen() 



It's just a wrapper around strlen(), so call that instead.

Also add a few #include <linux/string.h> to fix up the build with this
change.

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 e4bcecd9

drivers/staging/csr/csr_serialize_primitive_types.c

+7 −7
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ EXPORT_SYMBOL_GPL(CsrMemCpyDes); 
void CsrCharStringDes(char **value, u8 *buffer, size_t *offset)

{

    *value = kstrdup((char *) &buffer[*offset], GFP_KERNEL);

    *offset += CsrStrLen(*value) + 1;

    *offset += strlen(*value) + 1;

}

EXPORT_SYMBOL_GPL(CsrCharStringDes);



void CsrUtf8StringDes(u8 **value, u8 *buffer, size_t *offset)

{

    *value = (u8 *)kstrdup((char *) &buffer[*offset], GFP_KERNEL);

    *offset += CsrStrLen((char *) *value) + 1;

    *offset += strlen((char *) *value) + 1;

}



void CsrUtf16StringDes(u16 **value, u8 *buffer, size_t *offset)
@@ -124,7 +124,7 @@ void CsrCharStringSer(u8 *buffer, size_t *offset, const char *value) 
    if (value)

    {

        strcpy(((char *) &buffer[*offset]), value);

        *offset += CsrStrLen(value) + 1;

        *offset += strlen(value) + 1;

    }

    else

    {
@@ -176,7 +176,7 @@ u32 CsrCharStringSerLen(const char *str) 
{

    if (str)

    {

        return (u32) (CsrStrLen(str) + sizeof(*str));

        return (u32)(strlen(str) + sizeof(*str));

    }

    else

    {
@@ -188,7 +188,7 @@ u32 CsrUtf8StringSerLen(const u8 *str) 
{

    if (str)

    {

        return (u32) (CsrStrLen((char *) str) + sizeof(*str));

        return (u32)(strlen((char *) str) + sizeof(*str));

    }

    else

    {
@@ -390,7 +390,7 @@ void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length) 
size_t CsrEventCsrUint16CsrCharStringSizeof(void *msg)

{

    CsrEventCsrUint16CsrCharString *primitive = (CsrEventCsrUint16CsrCharString *) msg;

    return 4 + CsrStrLen(primitive->value2) + 1;

    return 4 + strlen(primitive->value2) + 1;

}



u8 *CsrEventCsrUint16CsrCharStringSer(u8 *ptr, size_t *len, void *msg)
@@ -445,7 +445,7 @@ void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length) 
size_t CsrEventCsrUint32CsrCharStringSizeof(void *msg)

{

    CsrEventCsrUint32CsrCharString *primitive = (CsrEventCsrUint32CsrCharString *) msg;

    return 6 + CsrStrLen(primitive->value2) + 1;

    return 6 + strlen(primitive->value2) + 1;

}



u8 *CsrEventCsrUint32CsrCharStringSer(u8 *ptr, size_t *len, void *msg)

drivers/staging/csr/csr_utf16.c

+2 −2
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ u16 *CsrUtf82Utf16String(const u8 *utf8String) 
    {

        return NULL;

    }

    sourceLength = CsrStrLen((char *) utf8String);

    sourceLength = strlen((char *)utf8String);



    for (i = 0; i < sourceLength; i++)

    {
@@ -1020,7 +1020,7 @@ u32 CsrUtf8StringLengthInBytes(const u8 *string) 
    size_t length = 0;

    if (string)

    {

        length = CsrStrLen((const char *) string);

        length = strlen((const char *)string);

    }

    return (u32) length;

}

drivers/staging/csr/csr_util.c

+0 −8
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ void *CsrMemCpy(void *dest, const void *src, size_t count) 
EXPORT_SYMBOL_GPL(CsrMemCpy);

#endif



#ifndef CSR_USE_STDC_LIB

size_t CsrStrLen(const char *string)

{

    return strlen(string);

}

EXPORT_SYMBOL_GPL(CsrStrLen);

#endif



MODULE_DESCRIPTION("CSR Operating System Kernel Abstraction");

MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");

MODULE_LICENSE("GPL and additional rights");

drivers/staging/csr/csr_util.h

+0 −2
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ void CsrUInt16ToHex(u16 number, char *str); 
/*------------------------------------------------------------------*/

#ifdef CSR_USE_STDC_LIB

#define CsrMemCpy memcpy

#define CsrStrLen strlen

#else /* !CSR_USE_STDC_LIB */

void *CsrMemCpy(void *dest, const void *src, size_t count);

size_t CsrStrLen(const char *string);

#endif /* !CSR_USE_STDC_LIB */



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

drivers/staging/csr/csr_wifi_nme_ap_serialize.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
*****************************************************************************/



/* Note: this is an auto-generated file. */



#include <linux/string.h>

#include "csr_pmem.h"

#include "csr_msgconv.h"

#include "csr_unicode.h"
@@ -324,7 +324,7 @@ size_t CsrWifiNmeApStartReqSizeof(void *msg) 
                    break;

                case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE:

                    bufferSize += 2;                                                                                                                                                                                                                      /* u16 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode */

                    bufferSize += (primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase?CsrStrLen(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase) : 0) + 1; /* char* primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase (0 byte len + 1 for NULL Term) */

                    bufferSize += (primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase ? strlen(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase) : 0) + 1; /* char* primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase (0 byte len + 1 for NULL Term) */

                    break;

                default:

                    break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE