Skip to content

Commit

Permalink
staging: csr: remove CsrVsnprintf()
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2012
1 parent 5a0c09f commit e4bcecd
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/csr/csr_formatted_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...)
s32 r;
va_list args;
va_start(args, fmt);
r = CsrVsnprintf(dest, n, fmt, args);
r = vsnprintf(dest, n, fmt, args);
va_end(args);

if (dest && (n > 0))
Expand Down
6 changes: 0 additions & 6 deletions drivers/staging/csr/csr_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ size_t CsrStrLen(const char *string)
EXPORT_SYMBOL_GPL(CsrStrLen);
#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_AUTHOR("Cambridge Silicon Radio Ltd.");
MODULE_LICENSE("GPL and additional rights");
1 change: 0 additions & 1 deletion drivers/staging/csr/csr_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ void CsrUInt16ToHex(u16 number, char *str);
void *CsrMemCpy(void *dest, const void *src, size_t count);
size_t CsrStrLen(const char *string);
#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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void unifi_debug_log_to_buf(const char *fmt, ...)
va_list args;

va_start(args, fmt);
CsrVsnprintf(s, DEBUG_BUFFER_SIZE, fmt, args);
vsnprintf(s, DEBUG_BUFFER_SIZE, fmt, args);
va_end(args);

unifi_debug_string_to_buf(s);
Expand Down

0 comments on commit e4bcecd

Please sign in to comment.