From a5cc8cbfa88d460756874522d89ee8d20ca0895d Mon Sep 17 00:00:00 2001
From: Alwin Beukers <alwin@broadcom.com>
Date: Wed, 12 Oct 2011 20:51:27 +0200
Subject: [PATCH] --- yaml --- r: 266783 b: refs/heads/master c:
 b0551fb7e01d76165367ce77ddfcb80009b31427 h: refs/heads/master i:   266781:
 bda1a62532b035efd827b28b9b4b980537ca8098   266779:
 f0e4b80a4bfaa4c4baaa0669db56dc25961f52f5   266775:
 6c2ad62d3484000798b5cb038f5e4da0311c190e   266767:
 8d4b5f81aeab47378d733cde3e570a12c039fbd1   266751:
 298bff5d324dbb069ef53835943fd98ce7d4c38f v: v3

---
 [refs]                                                |  2 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_sdio.c        | 11 ++++++++++-
 trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c | 10 ----------
 .../net/wireless/brcm80211/include/brcmu_utils.h      |  2 --
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index c3fa7363f1f4..b1dc1d7361c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6ac17a20a424fdfb049ae475d62b92c192d1bc
+refs/heads/master: b0551fb7e01d76165367ce77ddfcb80009b31427
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 6885755f4ec6..e7f1d5faacc8 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/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/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c b/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c
index 1851f93c9355..74eb1e6f060b 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/trunk/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/trunk/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/trunk/drivers/net/wireless/brcm80211/include/brcmu_utils.h
index d716cd2a5206..e53883c3f446 100644
--- a/trunk/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+++ b/trunk/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);