Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0551fb7 authored by Alwin Beukers's avatar Alwin Beukers Committed by John W. Linville
Browse files

brcm80211: moved function brcmu_chipname 



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

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ef6ac17a

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+10 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/wireless/brcm80211/brcmutil/utils.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/brcm80211/include/brcmu_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -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);