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

Commit c9eb65a4 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcm80211: smac: remove unused fields from struct si_pub definition 



Several fields from the si_pub structure were not used or only set
once but never checked. These fields have been removed.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08445552

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+0 −7
Original line number Diff line number Diff line
@@ -932,10 +932,6 @@ ai_buscore_setup(struct si_info *sii, u32 savewin, uint *origidx) 


	/* get chipcommon capabilites */

	sii->pub.cccaps = R_REG(&cc->capabilities);

	/* get chipcommon extended capabilities */



	if (sii->pub.ccrev >= 35)

		sii->pub.cccaps_ext = R_REG(&cc->capabilities_ext);



	/* get pmu rev and caps */

	if (sii->pub.cccaps & CC_CAP_PMU) {
@@ -1023,7 +1019,6 @@ static __used void ai_nvram_process(struct si_info *sii) 


	sii->pub.boardvendor = w & 0xffff;

	sii->pub.boardtype = (w >> 16) & 0xffff;

	sii->pub.boardflags = getintvar(&sii->pub, BRCMS_SROM_BOARDFLAGS);

}



static struct si_info *ai_doattach(struct si_info *sii,
@@ -1071,8 +1066,6 @@ static struct si_info *ai_doattach(struct si_info *sii, 
	sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;

	sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;



	sih->issim = false;



	/* scan for cores */

	if (socitype == SOCI_AI) {

		SI_MSG("Found chip type AI (0x%08x)\n", w);

drivers/net/wireless/brcm80211/brcmsmac/aiutils.h

+0 −7
Original line number Diff line number Diff line
@@ -149,21 +149,14 @@ struct si_pub { 
	uint buscoreidx;	/* buscore index */

	int ccrev;		/* chip common core rev */

	u32 cccaps;		/* chip common capabilities */

	u32 cccaps_ext;	/* chip common capabilities extension */

	int pmurev;		/* pmu core rev */

	u32 pmucaps;		/* pmu capabilities */

	uint boardtype;		/* board type */

	uint boardvendor;	/* board vendor */

	uint boardflags;	/* board flags */

	uint boardflags2;	/* board flags2 */

	uint chip;		/* chip number */

	uint chiprev;		/* chip revision */

	uint chippkg;		/* chip package option */

	u32 chipst;		/* chip status */

	bool issim;		/* chip is in simulation or emulation */

	uint socirev;		/* SOC interconnect rev */

	bool pci_pr32414;



};



struct pci_dev;