diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 14:50:38 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 14:50:38 -0700 |
commit | e4bcecd947a40731cbbbf44f8584f99070608416 (patch) | |
tree | 73397161fde3a33ce49d9bd124f1a99ac46f0fd4 /drivers/staging | |
parent | 5a0c09fd736d2518409e0eabe4c3039058e6fdfc (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/csr/csr_formatted_io.c | 2 | ||||
-rw-r--r-- | drivers/staging/csr/csr_util.c | 6 | ||||
-rw-r--r-- | drivers/staging/csr/csr_util.h | 1 | ||||
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/csr/csr_formatted_io.c b/drivers/staging/csr/csr_formatted_io.c index 51fb988a587a..bda8712f11f8 100644 --- a/drivers/staging/csr/csr_formatted_io.c +++ b/drivers/staging/csr/csr_formatted_io.c @@ -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)) diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index ff1b85e5097c..397345c3ac24 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -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"); diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index 2efc3311c93a..1a911ca2424e 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -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) diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c index b491110d230b..a111d40f3e34 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -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); |