staging: brcm80211: removed unused softmac code after macro cleanup

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>

diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index d30116d97b14cfec33c311a20330057c75ad0328..7ebe0607a8463a22bcc22514f9b26b6ffa1b9426 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -5982,8 +5982,6 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
                for (i = 0; i < wlc->pub->_nbands; i++) {
                        memset(wlc->bandstate[i]->hw_rateset.mcs, 0,
                               MCSSET_LEN);
-                       if (IS_MCS(0))
-                               brcms_c_reprate_init(wlc);
                }
                break;
 

diff --git a/drivers/staging/brcm80211/brcmsmac/stf.c b/drivers/staging/brcm80211/brcmsmac/stf.c
index 71c5d23795710237774b9c16236aca84befee7db..82805e0a826c457cb3d0b54c796945ae96c8a024 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/stf.c
@@ -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)
                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->txstreams = txstreams;
        brcms_c_stf_stbc_tx_set(wlc, wlc->band->band_stf_stbc_tx);