staging: brcm80211: delete ASSERTs in 4 files in brcmsmac dir

wlc_antsel.c, wlc_channel.c, wlc_rate.c and wlc_stf.c are now
ASSERT free.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 0121ce3ec493a7fa5ae2051397b00dc8dc7789ce..89346fe5249b8a026fa69fc16c3cd96422d7d108 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -130,7 +130,6 @@ struct antsel_info *wlc_antsel_attach(struct wlc_info *wlc)
                                asi->antsel_avail = false;
                                wiphy_err(wlc->wiphy, "wlc_antsel_attach: 2o3 "
                                          "board cfg invalid\n");
-                               ASSERT(0);
                        }
                        break;
                default:
@@ -298,8 +297,6 @@ static int wlc_antsel_cfgupd(struct antsel_info *asi, wlc_antselcfg_t *antsel)
        u8 ant_cfg;
        u16 mimo_antsel;
 
-       ASSERT(asi->antsel_type != ANTSEL_NA);
-
        /* 1) Update TX antconfig for all frames that are not unicast data
         *    (aka default TX)
         */

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index ec55ea5cac13c36d2289d346d345443fbe2c29f5..345c197fd48de56e784fd52c31c5ba0a08aac557 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -594,8 +594,7 @@ struct chan20_info chan20_info[] = {
 static const locale_info_t *wlc_get_locale_2g(u8 locale_idx)
 {
        if (locale_idx >= ARRAY_SIZE(g_locale_2g_table)) {
-               ASSERT(locale_idx < ARRAY_SIZE(g_locale_2g_table));
-               return NULL;
+               return NULL; /* error condition */
        }
        return g_locale_2g_table[locale_idx];
 }
@@ -603,8 +602,7 @@ static const locale_info_t *wlc_get_locale_2g(u8 locale_idx)
 static const locale_info_t *wlc_get_locale_5g(u8 locale_idx)
 {
        if (locale_idx >= ARRAY_SIZE(g_locale_5g_table)) {
-               ASSERT(locale_idx < ARRAY_SIZE(g_locale_5g_table));
-               return NULL;
+               return NULL; /* error condition */
        }
        return g_locale_5g_table[locale_idx];
 }
@@ -656,8 +654,6 @@ wlc_cm_info_t *wlc_channel_mgr_attach(struct wlc_info *wlc)
        strncpy(country_abbrev, "X2", sizeof(country_abbrev) - 1);
        country = wlc_country_lookup(wlc, country_abbrev);
 
-       ASSERT(country != NULL);
-
        /* save default country for exiting 11d regulatory mode */
        strncpy(wlc->country_default, country_abbrev, WLC_CNTRY_BUF_SZ - 1);
 
@@ -708,7 +704,6 @@ wlc_set_countrycode_rev(wlc_cm_info_t *wlc_cm,
                                        &mapped_regrev);
        } else {
                /* find the matching built-in country definition */
-               ASSERT(0);
                country = wlc_country_lookup_direct(ccode, regrev);
                strncpy(mapped_ccode, ccode, WLC_CNTRY_BUF_SZ);
                mapped_regrev = regrev;
@@ -738,8 +733,6 @@ wlc_set_country_common(wlc_cm_info_t *wlc_cm,
        struct wlc_info *wlc = wlc_cm->wlc;
        char prev_country_abbrev[WLC_CNTRY_BUF_SZ];
 
-       ASSERT(country != NULL);
-
        /* save current country state */
        wlc_cm->country = country;
 
@@ -824,7 +817,6 @@ static const country_info_t *wlc_countrycode_map(wlc_cm_info_t *wlc_cm,
                *mapped_regrev = srom_regrev;
                mapped = 0;
                wiphy_err(wlc->wiphy, "srom_code == ccode %s\n", __func__);
-               ASSERT(0);
        } else {
                mapped =
                    wlc_country_aggregate_map(wlc_cm, ccode, mapped_ccode,
@@ -837,7 +829,6 @@ static const country_info_t *wlc_countrycode_map(wlc_cm_info_t *wlc_cm,
        /* if there is not an exact rev match, default to rev zero */
        if (country == NULL && *mapped_regrev != 0) {
                *mapped_regrev = 0;
-               ASSERT(0);
                country =
                    wlc_country_lookup_direct(mapped_ccode, *mapped_regrev);
        }
@@ -874,8 +865,6 @@ static const country_info_t *wlc_country_lookup_direct(const char *ccode,
                        return &cntry_locales[i].country;
                }
        }
-
-       ASSERT(0);
        return NULL;
 }
 
@@ -896,12 +885,10 @@ wlc_channels_init(wlc_cm_info_t *wlc_cm, const country_info_t *country)
                li = BAND_5G(band->bandtype) ?
                    wlc_get_locale_5g(country->locale_5G) :
                    wlc_get_locale_2g(country->locale_2G);
-               ASSERT(li);
                wlc_cm->bandstate[band->bandunit].locale_flags = li->flags;
                li_mimo = BAND_5G(band->bandtype) ?
                    wlc_get_mimo_5g(country->locale_mimo_5G) :
                    wlc_get_mimo_2g(country->locale_mimo_2G);
-               ASSERT(li_mimo);
 
                /* merge the mimo non-mimo locale flags */
                wlc_cm->bandstate[band->bandunit].locale_flags |=
@@ -1509,7 +1496,6 @@ wlc_valid_chanspec_ext(wlc_cm_info_t *wlc_cm, chanspec_t chspec, bool dualband)
        if (wf_chspec_malformed(chspec)) {
                wiphy_err(wlc->wiphy, "wl%d: malformed chanspec 0x%x\n",
                        wlc->pub->unit, chspec);
-               ASSERT(0);
                return false;
        }
 

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
index 8c1b8f0cad190535f9588cd34244c448fedf415f..50a9fb5940201eb7b160718ac82dadda25da4f45 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
@@ -315,7 +315,6 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs,
        count = 0;
        for (i = 0; i < hw_rs->count; i++) {
                r = hw_rs->rates[i] & WLC_RATE_MASK;
-               ASSERT(r <= WLC_MAXRATE);
                if (rateset[r])
                        rs->rates[count++] = rateset[r];
        }
@@ -364,8 +363,7 @@ ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp)
                case PRXS0_STDN:
                        /* fallthru */
                default:
-                       /* not supported */
-                       ASSERT(0);
+                       /* not supported, error condition */
                        break;
                }
                if (PLCP3_ISSGI(plcp[3]))
@@ -451,7 +449,7 @@ wlc_rateset_default(wlc_rateset_t *rs_tgt, const wlc_rateset_t *rs_hw,
        } else if (PHYTYPE_IS(phy_type, PHY_TYPE_G)) {
                rs_dflt = &cck_ofdm_rates;
        } else {
-               ASSERT(0);      /* should not happen */
+               /* should not happen, error condition */
                rs_dflt = &cck_rates;   /* force cck */
        }
 

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index c006ab5751ea212579b245ae2d825e87474e8027..6eff7ef14f3e351b92d7e7d5bba0deaf15014dba 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -69,9 +69,6 @@ const u8 txcore_default[5] = {
 
 static void wlc_stf_stbc_rx_ht_update(struct wlc_info *wlc, int val)
 {
-       ASSERT((val == HT_CAP_RX_STBC_NO)
-              || (val == HT_CAP_RX_STBC_ONE_STREAM));
-
        /* MIMOPHYs rev3-6 cannot receive STBC with only one rx core active */
        if (WLC_STF_SS_STBC_RX(wlc)) {
                if ((wlc->stf->rxstreams == 1) && (val != HT_CAP_RX_STBC_NO))
@@ -196,8 +193,6 @@ static int wlc_stf_txcore_set(struct wlc_info *wlc, u8 Nsts, u8 core_mask)
        WL_TRACE("wl%d: %s: Nsts %d core_mask %x\n",
                 wlc->pub->unit, __func__, Nsts, core_mask);
 
-       ASSERT((Nsts > 0) && (Nsts <= MAX_STREAMS_SUPPORTED));
-
        if (WLC_BITSCNT(core_mask) > wlc->stf->txstreams) {
                core_mask = 0;
        }
@@ -208,8 +203,6 @@ static int wlc_stf_txcore_set(struct wlc_info *wlc, u8 Nsts, u8 core_mask)
                core_mask = wlc->stf->txchain;
        }
 
-       ASSERT(!core_mask || Nsts <= WLC_BITSCNT(core_mask));
-
        wlc->stf->txcore[Nsts] = core_mask;
        /* Nsts = 1..4, txcore index = 1..4 */
        if (Nsts == 1) {
@@ -323,9 +316,6 @@ int wlc_stf_ss_update(struct wlc_info *wlc, struct wlcband *band)
        if (WLC_STBC_CAP_PHY(wlc) &&
            wlc->stf->ss_algosel_auto
            && (wlc->stf->ss_algo_channel != (u16) -1)) {
-               ASSERT(isset(&wlc->stf->ss_algo_channel, PHY_TXC1_MODE_CDD)
-                      || isset(&wlc->stf->ss_algo_channel,
-                               PHY_TXC1_MODE_SISO));
                upd_stf_ss = (wlc->stf->no_cddstbc || (wlc->stf->txstreams == 1)
                              || isset(&wlc->stf->ss_algo_channel,
                                       PHY_TXC1_MODE_SISO)) ? PHY_TXC1_MODE_SISO
@@ -425,9 +415,6 @@ static void _wlc_stf_phy_txant_upd(struct wlc_info *wlc)
        s8 txant;
 
        txant = (s8) wlc->stf->txant;
-       ASSERT(txant == ANT_TX_FORCE_0 || txant == ANT_TX_FORCE_1
-              || txant == ANT_TX_LAST_RX);
-
        if (WLC_PHY_11N_CAP(wlc->band)) {
                if (txant == ANT_TX_FORCE_0) {
                        wlc->stf->phytxant = PHY_TXC_ANT_0;
@@ -443,8 +430,8 @@ static void _wlc_stf_phy_txant_upd(struct wlc_info *wlc)
                        if (WLCISLCNPHY(wlc->band) || WLCISSSLPNPHY(wlc->band))
                                wlc->stf->phytxant = PHY_TXC_LCNPHY_ANT_LAST;
                        else {
-                               /* keep this assert to catch out of sync wlc->stf->txcore */
-                               ASSERT(wlc->stf->txchain > 0);
+                               /* catch out of sync wlc->stf->txcore */
+                               WARN_ON(wlc->stf->txchain <= 0);
                                wlc->stf->phytxant =
                                    wlc->stf->txchain << PHY_TXC_ANT_SHIFT;
                        }
@@ -508,7 +495,6 @@ static u16 _wlc_stf_phytxchain_sel(struct wlc_info *wlc, ratespec_t rspec)
        u16 phytxant = wlc->stf->phytxant;
 
        if (RSPEC_STF(rspec) != PHY_TXC1_MODE_SISO) {
-               ASSERT(wlc->stf->txstreams > 1);
                phytxant = wlc->stf->txchain << PHY_TXC_ANT_SHIFT;
        } else if (wlc->stf->txant == ANT_TX_DEF)
                phytxant = wlc->stf->txchain << PHY_TXC_ANT_SHIFT;
@@ -528,7 +514,6 @@ u16 wlc_stf_d11hdrs_phyctl_txant(struct wlc_info *wlc, ratespec_t rspec)
 
        /* for non-siso rates or default setting, use the available chains */
        if (WLCISNPHY(wlc->band)) {
-               ASSERT(wlc->stf->txchain != 0);
                phytxant = _wlc_stf_phytxchain_sel(wlc, rspec);
                mask = PHY_TXC_HTANT_MASK;
        }