diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 15:04:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 15:04:31 -0700 |
| commit | ed51b4d84e7a11813bf09c5db41cedec18a69d50 (patch) | |
| tree | ba10fa7519da1990dffc92484ae84312d50c235f /drivers/staging | |
| parent | staging: csr: remove CsrMemCpy() (diff) | |
| download | linux-dev-ed51b4d84e7a11813bf09c5db41cedec18a69d50.tar.xz linux-dev-ed51b4d84e7a11813bf09c5db41cedec18a69d50.zip | |
staging: csr: make CsrUInt16ToHex static
We do this by moving it from csr_util.c to csr_wifi_hip_card_sdio_intr.c
as that's the only place that called it.
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_util.c | 18 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_util.h | 5 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 16 |
3 files changed, 16 insertions, 23 deletions
diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index ae2e1dcbfd4d..09dd754f2144 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -15,24 +15,6 @@ #include "csr_pmem.h" #include "csr_util.h" -/*------------------------------------------------------------------*/ -/* Base conversion */ -/*------------------------------------------------------------------*/ -/* Convert signed 32 bit (or less) integer to string */ -void CsrUInt16ToHex(u16 number, char *str) -{ - u16 index; - u16 currentValue; - - for (index = 0; index < 4; index++) - { - currentValue = (u16) (number & 0x000F); - number >>= 4; - str[3 - index] = (char) (currentValue > 9 ? currentValue + 55 : currentValue + '0'); - } - str[4] = '\0'; -} - 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 d60d8df3b89b..80c2f2b51401 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -18,11 +18,6 @@ extern "C" { #include <linux/types.h> #include "csr_macro.h" -/*------------------------------------------------------------------*/ -/* Base conversion */ -/*------------------------------------------------------------------*/ -void CsrUInt16ToHex(u16 number, char *str); - #define CsrOffsetOf(st, m) ((size_t) & ((st *) 0)->m) #ifdef __cplusplus 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 6536cb35cf61..9fdd577bb171 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -128,6 +128,22 @@ void unifi_debug_log_to_buf(const char *fmt, ...) } /* unifi_debug_log_to_buf() */ +/* Convert signed 32 bit (or less) integer to string */ +static void CsrUInt16ToHex(u16 number, char *str) +{ + u16 index; + u16 currentValue; + + for (index = 0; index < 4; index++) + { + currentValue = (u16) (number & 0x000F); + number >>= 4; + str[3 - index] = (char) (currentValue > 9 ? currentValue + 55 : currentValue + '0'); + } + str[4] = '\0'; +} + + /* * --------------------------------------------------------------------------- * unifi_debug_hex_to_buf |