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

Commit c88cfa07 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: use brcmf_chip_name() for consistency 



When logging the chip id/revision information make use of
brcmf_chip_name() so it is always the same.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 756a2b39

drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

+2 −3
Original line number Diff line number Diff line
@@ -926,9 +926,8 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv *ci) 


	brcmf_chip_name(ci->pub.chip, ci->pub.chiprev,

			ci->pub.name, sizeof(ci->pub.name));

	brcmf_dbg(INFO, "found %s chip: BCM%s, rev=%d\n",

		  socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name,

		  ci->pub.chiprev);

	brcmf_dbg(INFO, "found %s chip: %s\n",

		  socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name);



	if (socitype == SOCI_SB) {

		if (ci->pub.chip != BRCM_CC_4329_CHIP_ID) {

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "firmware.h"

#include "core.h"

#include "common.h"

#include "chip.h"



#define BRCMF_FW_MAX_NVRAM_SIZE			64000

#define BRCMF_FW_NVRAM_DEVPATH_LEN		19	/* devpath0=pcie/1/4/ */
@@ -567,6 +568,7 @@ int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev, 
			      u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],

			      char nvram_name[BRCMF_FW_NAME_LEN])

{

	char chipname[12];

	u32 i;

	char end;
@@ -581,6 +583,8 @@ int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev, 
		return -ENODEV;

	}



	brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));



	/* check if firmware path is provided by module parameter */

	if (brcmf_mp_global.firmware_path[0] != '\0') {

		strlcpy(fw_name, brcmf_mp_global.firmware_path,
@@ -601,8 +605,7 @@ int brcmf_fw_map_chip_to_name(u32 chip, u32 chiprev, 
	if ((nvram_name) && (mapping_table[i].nvram))

		strlcat(nvram_name, mapping_table[i].nvram, BRCMF_FW_NAME_LEN);



	brcmf_info("using %s for chip %#08x(%d) rev %#08x\n",

		   fw_name, chip, chip, chiprev);

	brcmf_info("using %s for chip %s\n", fw_name, chipname);



	return 0;

}