brcm80211: moved function brcmu_chipname

Moved the brcmu_chipname function into the only file using it.
The function name was adjusted accordingly.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 10 insertions, 13 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 6885755f4ec..e7f1d5faacc 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3991,6 +3991,15 @@ static const struct sdiod_drive_str sdiod_drive_strength_tab3[] = {
 
 #define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) << 16) | (pmu))
 
+static char *brcmf_chipname(uint chipid, char *buf, uint len)
+{
+        const char *fmt;
+
+        fmt = ((chipid > 0xa000) || (chipid < 0x4000)) ? "%d" : "%x";
+        snprintf(buf, len, fmt, chipid);
+        return buf;
+}
+
 static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,
                                                    u32 drivestrength) {
         struct sdiod_drive_str *str_tab = NULL;
@@ -4020,7 +4029,7 @@ static void brcmf_sdbrcm_sdiod_drive_strength_init(struct brcmf_bus *bus,
                 break;
         default:
                 brcmf_dbg(ERROR, "No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",
-                          brcmu_chipname(bus->ci->chip, chn, 8),
+                          brcmf_chipname(bus->ci->chip, chn, 8),
                           bus->ci->chiprev, bus->ci->pmurev);
                 break;
         }
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index 1851f93c935..74eb1e6f060 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -469,16 +469,6 @@ int brcmu_format_hex(char *str, const void *bytes, int len)
 EXPORT_SYMBOL(brcmu_format_hex);
 #endif                          /* defined(BCMDBG) */
 
-char *brcmu_chipname(uint chipid, char *buf, uint len)
-{
-        const char *fmt;
-
-        fmt = ((chipid > 0xa000) || (chipid < 0x4000)) ? "%d" : "%x";
-        snprintf(buf, len, fmt, chipid);
-        return buf;
-}
-EXPORT_SYMBOL(brcmu_chipname);
-
 uint brcmu_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
 {
         uint len;
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
index d716cd2a520..e53883c3f44 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
@@ -207,8 +207,6 @@ extern int brcmu_format_flags(const struct brcmu_bit_desc *bd, u32 flags,
 extern int brcmu_format_hex(char *str, const void *bytes, int len);
 #endif
 
-extern char *brcmu_chipname(uint chipid, char *buf, uint len);
-
 extern struct brcmu_tlv *brcmu_parse_tlvs(void *buf, int buflen,
                                           uint key);