Commit e4bcecd9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: csr: remove CsrVsnprintf()

It's just a wrapper for vsnprintf() 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 5a0c09fd
...@@ -16,7 +16,7 @@ s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...) ...@@ -16,7 +16,7 @@ s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
s32 r; s32 r;
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
r = CsrVsnprintf(dest, n, fmt, args); r = vsnprintf(dest, n, fmt, args);
va_end(args); va_end(args);
if (dest && (n > 0)) if (dest && (n > 0))
......
...@@ -52,12 +52,6 @@ size_t CsrStrLen(const char *string) ...@@ -52,12 +52,6 @@ size_t CsrStrLen(const char *string)
EXPORT_SYMBOL_GPL(CsrStrLen); EXPORT_SYMBOL_GPL(CsrStrLen);
#endif #endif
s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args)
{
return vsnprintf(string, count, format, args);
}
EXPORT_SYMBOL_GPL(CsrVsnprintf);
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");
...@@ -33,7 +33,6 @@ void CsrUInt16ToHex(u16 number, char *str); ...@@ -33,7 +33,6 @@ void CsrUInt16ToHex(u16 number, char *str);
void *CsrMemCpy(void *dest, const void *src, size_t count); void *CsrMemCpy(void *dest, const void *src, size_t count);
size_t CsrStrLen(const char *string); size_t CsrStrLen(const char *string);
#endif /* !CSR_USE_STDC_LIB */ #endif /* !CSR_USE_STDC_LIB */
s32 CsrVsnprintf(char *string, size_t count, const char *format, va_list args);
#define CsrOffsetOf(st, m) ((size_t) & ((st *) 0)->m) #define CsrOffsetOf(st, m) ((size_t) & ((st *) 0)->m)
......
...@@ -121,7 +121,7 @@ void unifi_debug_log_to_buf(const char *fmt, ...) ...@@ -121,7 +121,7 @@ void unifi_debug_log_to_buf(const char *fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
CsrVsnprintf(s, DEBUG_BUFFER_SIZE, fmt, args); vsnprintf(s, DEBUG_BUFFER_SIZE, fmt, args);
va_end(args); va_end(args);
unifi_debug_string_to_buf(s); unifi_debug_string_to_buf(s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment