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

staging: brcm80211: removed unused softmac code after macro cleanup

Browse Source 
Since the macro's IS_MCS(0), RSPEC_STF(0) and PHY_TXC1_MODE_SISO all
expand to 0, inactive code could be removed.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen
2011-09-12 12:14:58 +02:00
committed by Greg Kroah-Hartman
parent 72660455c3
commit e046da4fd9
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmsmac/main.c
View File

@@ -5982,8 +5982,6 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
for (i = 0; i < wlc->pub->_nbands; i++) { for (i = 0; i < wlc->pub->_nbands; i++) {
memset(wlc->bandstate[i]->hw_rateset.mcs, 0, memset(wlc->bandstate[i]->hw_rateset.mcs, 0,
MCSSET_LEN); MCSSET_LEN);
if (IS_MCS(0))
brcms_c_reprate_init(wlc);
} }
break; break;

26
drivers/staging/brcm80211/brcmsmac/stf.c
View File

@@ -291,32 +291,6 @@ int brcms_c_stf_txchain_set(struct brcms_c_info *wlc, s32 int_val, bool force)
if (txstreams > MAX_STREAMS_SUPPORTED) if (txstreams > MAX_STREAMS_SUPPORTED)
return -EINVAL; return -EINVAL;
if (txstreams == 1) {
for (i = 0; i < wlc->pub->_nbands; i++)
if ((RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO)
|| (RSPEC_STF(0) !=
PHY_TXC1_MODE_SISO)) {
if (!force)
return -EBADE;
/* over-write the override rspec */
if (RSPEC_STF(0)
!= PHY_TXC1_MODE_SISO) {
wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO "
"rspec_override\n",
__func__);
}
if (RSPEC_STF(0) != PHY_TXC1_MODE_SISO) {
wiphy_err(wlc->wiphy, "%s(): temp "
"sense override non-SISO "
"mrspec_override\n",
__func__);
}
}
}
wlc->stf->txchain = txchain; wlc->stf->txchain = txchain;
wlc->stf->txstreams = txstreams; wlc->stf->txstreams = txstreams;
brcms_c_stf_stbc_tx_set(wlc, wlc->band->band_stf_stbc_tx); brcms_c_stf_stbc_tx_set(wlc, wlc->band->band_stf_stbc_tx);