---

yaml
---
r: 266783
b: refs/heads/master
c: b0551fb
h: refs/heads/master
i:
  266781: bda1a62
  266779: f0e4b80
  266775: 6c2ad62
  266767: 8d4b5f8
  266751: 298bff5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6ac17a20a424fdfb049ae475d62b92c192d1bc
+refs/heads/master: b0551fb7e01d76165367ce77ddfcb80009b31427

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;
 	}

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;

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);