Skip to content

Commit

Permalink
staging: csr: make CsrUInt16ToHex static
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2012
1 parent 25aebdb commit ed51b4d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 23 deletions.
18 changes: 0 additions & 18 deletions drivers/staging/csr/csr_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
5 changes: 0 additions & 5 deletions drivers/staging/csr/csr_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ed51b4d

Please sign in to comment.