mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
staging: csr: remove CsrStrDup
Use kstrdup() for the few places that called it, and remove CsrUtf8StrDup() as no one calls that function. 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>
This commit is contained in:
parent
6a4f6d38a3
commit
5a0c09fd73
5 changed files with 2 additions and 47 deletions
|
@ -49,14 +49,14 @@ EXPORT_SYMBOL_GPL(CsrMemCpyDes);
|
|||
|
||||
void CsrCharStringDes(char **value, u8 *buffer, size_t *offset)
|
||||
{
|
||||
*value = CsrStrDup((char *) &buffer[*offset]);
|
||||
*value = kstrdup((char *) &buffer[*offset], GFP_KERNEL);
|
||||
*offset += CsrStrLen(*value) + 1;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(CsrCharStringDes);
|
||||
|
||||
void CsrUtf8StringDes(u8 **value, u8 *buffer, size_t *offset)
|
||||
{
|
||||
*value = (u8 *) CsrStrDup((char *) &buffer[*offset]);
|
||||
*value = (u8 *)kstrdup((char *) &buffer[*offset], GFP_KERNEL);
|
||||
*offset += CsrStrLen((char *) *value) + 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -64,26 +64,6 @@ u32 CsrUtf8StringLengthInBytes(const u8 *string);
|
|||
*******************************************************************************/
|
||||
u8 *CsrUtf8StrTruncate(u8 *target, size_t count);
|
||||
|
||||
/*******************************************************************************
|
||||
|
||||
NAME
|
||||
CsrUtf8StrDup
|
||||
|
||||
DESCRIPTION
|
||||
This function will allocate memory and copy the source string into the
|
||||
allocated memory, which is then returned as a duplicate of the original
|
||||
string. The memory returned must be freed by calling CsrPmemFree when
|
||||
the duplicate is no longer needed.
|
||||
|
||||
PARAMETERS
|
||||
source - UTF-8 string to be duplicated.
|
||||
|
||||
RETURNS
|
||||
Returns a duplicate of source.
|
||||
|
||||
*******************************************************************************/
|
||||
u8 *CsrUtf8StrDup(const u8 *source);
|
||||
|
||||
/*
|
||||
* UCS2
|
||||
*
|
||||
|
|
|
@ -1053,8 +1053,3 @@ u8 *CsrUtf8StrTruncate(u8 *target, size_t count)
|
|||
|
||||
return target;
|
||||
}
|
||||
|
||||
u8 *CsrUtf8StrDup(const u8 *source)
|
||||
{
|
||||
return (u8 *) CsrStrDup((const char *) source);
|
||||
}
|
||||
|
|
|
@ -58,21 +58,6 @@ s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(CsrVsnprintf);
|
||||
|
||||
char *CsrStrDup(const char *string)
|
||||
{
|
||||
char *copy;
|
||||
u32 len;
|
||||
|
||||
copy = NULL;
|
||||
if (string != NULL)
|
||||
{
|
||||
len = CsrStrLen(string) + 1;
|
||||
copy = CsrPmemAlloc(len);
|
||||
CsrMemCpy(copy, string, len);
|
||||
}
|
||||
return copy;
|
||||
}
|
||||
|
||||
MODULE_DESCRIPTION("CSR Operating System Kernel Abstraction");
|
||||
MODULE_AUTHOR("Cambridge Silicon Radio Ltd.");
|
||||
MODULE_LICENSE("GPL and additional rights");
|
||||
|
|
|
@ -35,11 +35,6 @@ size_t CsrStrLen(const char *string);
|
|||
#endif /* !CSR_USE_STDC_LIB */
|
||||
s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args);
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
/* Non-standard utility functions */
|
||||
/*------------------------------------------------------------------*/
|
||||
char *CsrStrDup(const char *string);
|
||||
|
||||
#define CsrOffsetOf(st, m) ((size_t) & ((st *) 0)->m)
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
Loading…
Reference in a new issue