lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brcm80211: smac: remove unused fields from struct si_pub definition

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

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel
2011-12-08 15:06:43 -08:00
committed by John W. Linville
parent 084455524f
commit c9eb65a486
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
View File

@@ -932,10 +932,6 @@ ai_buscore_setup(struct si_info *sii, u32 savewin, uint *origidx)
/* get chipcommon capabilites */ /* get chipcommon capabilites */
sii->pub.cccaps = R_REG(&cc->capabilities); 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 */ /* get pmu rev and caps */
if (sii->pub.cccaps & CC_CAP_PMU) { 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.boardvendor = w & 0xffff;
sii->pub.boardtype = (w >> 16) & 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, 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->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT; sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
sih->issim = false;
/* scan for cores */ /* scan for cores */
if (socitype == SOCI_AI) { if (socitype == SOCI_AI) {
SI_MSG("Found chip type AI (0x%08x)\n", w); SI_MSG("Found chip type AI (0x%08x)\n", w);

7
drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
View File

@@ -149,21 +149,14 @@ struct si_pub {
uint buscoreidx; /* buscore index */ uint buscoreidx; /* buscore index */
int ccrev; /* chip common core rev */ int ccrev; /* chip common core rev */
u32 cccaps; /* chip common capabilities */ u32 cccaps; /* chip common capabilities */
u32 cccaps_ext; /* chip common capabilities extension */
int pmurev; /* pmu core rev */ int pmurev; /* pmu core rev */
u32 pmucaps; /* pmu capabilities */ u32 pmucaps; /* pmu capabilities */
uint boardtype; /* board type */ uint boardtype; /* board type */
uint boardvendor; /* board vendor */ uint boardvendor; /* board vendor */
uint boardflags; /* board flags */
uint boardflags2; /* board flags2 */
uint chip; /* chip number */ uint chip; /* chip number */
uint chiprev; /* chip revision */ uint chiprev; /* chip revision */
uint chippkg; /* chip package option */ uint chippkg; /* chip package option */
u32 chipst; /* chip status */ u32 chipst; /* chip status */
bool issim; /* chip is in simulation or emulation */
uint socirev; /* SOC interconnect rev */
bool pci_pr32414;
}; };
struct pci_dev; struct pci_dev;