Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: ASSERT cleanup in phy

Browse Source 
Code cleanup. Driver contains too many ASSERTs. Removed all ASSERTs
in the PHY that did not directly relate to a value being read from
hardware.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-04-01 12:07:10 +02:00 committed by Greg Kroah-Hartman
parent e2ce504977
commit 790c3093c0
2 changed files with 3 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
View File

@ -155,8 +155,6 @@ char *phy_getvar(phy_info_t *pi, const char *name)
char *s;
int len;
ASSERT(pi->vars != (char *)&pi->vars);
if (!name)
return NULL;
@ -241,7 +239,7 @@ u16 read_radio_reg(phy_info_t *pi, u16 addr)
break;
default:
ASSERT(VALID_PHYTYPE(pi->pubpi.phy_type));
break;
}
if ((D11REV_GE(pi->sh->corerev, 24)) ||
@ -579,9 +577,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp)
void wlc_phy_shared_detach(shared_phy_t *phy_sh)
{
if (phy_sh) {
if (phy_sh->phy_head) {
ASSERT(!phy_sh->phy_head);
}
kfree(phy_sh);
}
}
@ -781,8 +776,6 @@ void wlc_phy_detach(wlc_phy_t *pih)
pi->sh->phy_head = pi->next;
else if (pi->sh->phy_head->next == pi)
pi->sh->phy_head->next = NULL;
else
ASSERT(0);
if (pi->pi_fptr.detach)
(pi->pi_fptr.detach) (pi);
@ -894,7 +887,6 @@ u32 wlc_phy_clk_bwbits(wlc_phy_t *pih)
phy_bw_clkbits = SICF_BW40;
break;
default:
ASSERT(0);
break;
}
}
@ -967,8 +959,6 @@ void WLBANDINITFN(wlc_phy_init) (wlc_phy_t *pih, chanspec_t chanspec)
"wlc_phy_init: Called with the MAC running!" == NULL);
}
ASSERT(pi != NULL);
if (!(pi->measure_hold & PHY_HOLD_FOR_SCAN)) {
pi->measure_hold |= PHY_HOLD_FOR_NOT_ASSOC;
}
@ -979,7 +969,6 @@ void WLBANDINITFN(wlc_phy_init) (wlc_phy_t *pih, chanspec_t chanspec)
phy_init = pi->pi_fptr.init;
if (phy_init == NULL) {
ASSERT(phy_init != NULL);
return;
}
@ -1029,8 +1018,6 @@ int wlc_phy_down(wlc_phy_t *pih)
phy_info_t *pi = (phy_info_t *) pih;
int callbacks = 0;
ASSERT(pi->phytest_on == false);
if (pi->phycal_timer
&& !wlapi_del_timer(pi->sh->physhim, pi->phycal_timer))
callbacks++;
@ -1070,8 +1057,6 @@ wlc_phy_table_addr(phy_info_t *pi, uint tbl_id, uint tbl_offset,
void wlc_phy_table_data_write(phy_info_t *pi, uint width, u32 val)
{
ASSERT((width == 8) || (width == 16) || (width == 32));
if ((pi->sh->chip == BCM43224_CHIP_ID ||
pi->sh->chip == BCM43421_CHIP_ID) &&
(pi->sh->chiprev == 1) &&
@ -1105,8 +1090,6 @@ wlc_phy_write_table(phy_info_t *pi, const phytbl_info_t *ptbl_info,
const u16 *ptbl_16b = (const u16 *)ptbl_info->tbl_ptr;
const u32 *ptbl_32b = (const u32 *)ptbl_info->tbl_ptr;
ASSERT((tbl_width == 8) || (tbl_width == 16) || (tbl_width == 32));
write_phy_reg(pi, tblAddr, (tbl_id << 10) | tbl_offset);
for (idx = 0; idx < ptbl_info->tbl_len; idx++) {
@ -1148,8 +1131,6 @@ wlc_phy_read_table(phy_info_t *pi, const phytbl_info_t *ptbl_info,
u16 *ptbl_16b = (u16 *)ptbl_info->tbl_ptr;
u32 *ptbl_32b = (u32 *)ptbl_info->tbl_ptr;
ASSERT((tbl_width == 8) || (tbl_width == 16) || (tbl_width == 32));
write_phy_reg(pi, tblAddr, (tbl_id << 10) | tbl_offset);
for (idx = 0; idx < ptbl_info->tbl_len; idx++) {
@ -1258,7 +1239,6 @@ void wlc_phy_do_dummy_tx(phy_info_t *pi, bool ofdm, bool pa_on)
W_REG(&regs->txe_phyctl, (ofdm ? 1 : 0) | PHY_TXC_ANT_0);
if (ISNPHY(pi) || ISLCNPHY(pi)) {
ASSERT(ofdm);
W_REG(&regs->txe_phyctl1, 0x1A02);
}
@ -1317,7 +1297,6 @@ void wlc_phy_do_dummy_tx(phy_info_t *pi, bool ofdm, bool pa_on)
void wlc_phy_hold_upd(wlc_phy_t *pih, mbool id, bool set)
{
phy_info_t *pi = (phy_info_t *) pih;
ASSERT(id);
if (set) {
mboolset(pi->measure_hold, id);
@ -1439,8 +1418,6 @@ void wlc_phy_chanspec_set(wlc_phy_t *ppi, chanspec_t chanspec)
u16 m_cur_channel;
chansetfn_t chanspec_set = NULL;
ASSERT(!wf_chspec_malformed(chanspec));
m_cur_channel = CHSPEC_CHANNEL(chanspec);
if (CHSPEC_IS5G(chanspec))
m_cur_channel |= D11_CURCHANNEL_5G;
@ -1480,8 +1457,7 @@ int wlc_phy_chanspec_bandrange_get(phy_info_t *pi, chanspec_t chanspec)
range = wlc_phy_get_chan_freq_range_nphy(pi, channel);
} else if (ISLCNPHY(pi)) {
range = wlc_phy_chanspec_freq2bandrange_lpssn(freq);
} else
ASSERT(0);
}
return range;
}
@ -1511,8 +1487,6 @@ wlc_phy_chanspec_band_validch(wlc_phy_t *ppi, uint band, chanvec_t *channels)
uint i;
uint channel;
ASSERT((band == WLC_BAND_2G) || (band == WLC_BAND_5G));
memset(channels, 0, sizeof(chanvec_t));
for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {
@ -1535,8 +1509,6 @@ chanspec_t wlc_phy_chanspec_band_firstch(wlc_phy_t *ppi, uint band)
uint channel;
chanspec_t chspec;
ASSERT((band == WLC_BAND_2G) || (band == WLC_BAND_5G));
for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {
channel = chan_info_all[i].chan;
@ -1572,8 +1544,6 @@ chanspec_t wlc_phy_chanspec_band_firstch(wlc_phy_t *ppi, uint band)
return chspec;
}
ASSERT(0);
return (chanspec_t) INVCHANSPEC;
}
@ -1581,7 +1551,6 @@ int wlc_phy_txpower_get(wlc_phy_t *ppi, uint *qdbm, bool *override)
{
phy_info_t *pi = (phy_info_t *) ppi;
ASSERT(qdbm != NULL);
*qdbm = pi->tx_user_target[0];
if (override != NULL)
*override = pi->txpwroverride;
@ -1703,7 +1672,6 @@ wlc_phy_txpower_sromlimit(wlc_phy_t *ppi, uint channel, u8 *min_pwr,
break;
}
}
ASSERT(i < ARRAY_SIZE(chan_info_all));
if (pi->hwtxpwr) {
*max_pwr = pi->hwtxpwr[i];
@ -2134,7 +2102,6 @@ void wlc_phy_txpower_update_shm(phy_info_t *pi)
{
int j;
if (ISNPHY(pi)) {
ASSERT(0);
return;
}
@ -2466,8 +2433,6 @@ void wlc_phy_ant_rxdiv_set(wlc_phy_t *ppi, u8 val)
mod_phy_reg(pi, 0x410, (0x1 << 1), 0x00 << 1);
mod_phy_reg(pi, 0x410, (0x1 << 0), (u16) val << 0);
}
} else {
ASSERT(0);
}
if (!suspend)
@ -2483,7 +2448,6 @@ wlc_phy_noise_calc_phy(phy_info_t *pi, u32 *cmplx_pwr, s8 *pwr_ant)
u8 i;
memset((u8 *) cmplx_pwr_dbm, 0, sizeof(cmplx_pwr_dbm));
ASSERT(pi->pubpi.phy_corenum <= PHY_CORE_MAX);
wlc_phy_compute_dB(cmplx_pwr, cmplx_pwr_dbm, pi->pubpi.phy_corenum);
for (i = 0; i < pi->pubpi.phy_corenum; i++) {
@ -2529,7 +2493,6 @@ wlc_phy_noise_sample_request(wlc_phy_t *pih, u8 reason, u8 ch)
break;
default:
ASSERT(0);
break;
}
@ -2678,7 +2641,6 @@ static s8 wlc_phy_noise_read_shmem(phy_info_t *pi)
s8 noise_dbm = PHY_NOISE_FIXED_VAL_NPHY;
u8 idx, core;
ASSERT(pi->pubpi.phy_corenum <= PHY_CORE_MAX);
memset((u8 *) cmplx_pwr, 0, sizeof(cmplx_pwr));
memset((u8 *) noise_dbm_ant, 0, sizeof(noise_dbm_ant));
@ -2760,8 +2722,6 @@ void wlc_phy_noise_sample_intr(wlc_phy_t *pih)
channel = jssi_aux & D11_CURCHANNEL_MAX;
noise_dbm = wlc_phy_noise_read_shmem(pi);
} else {
ASSERT(0);
}
wlc_phy_noise_cb(pi, channel, noise_dbm);
@ -2871,10 +2831,7 @@ void BCMFASTPATH wlc_phy_rssi_compute(wlc_phy_t *pih, void *ctx)
rssi -= 256;
} else if (radioid == BCM2055_ID || radioid == BCM2056_ID
|| radioid == BCM2057_ID) {
ASSERT(ISNPHY(pi));
rssi = wlc_phy_rssi_compute_nphy(pi, wlc_rxhdr);
} else {
ASSERT((const char *)"Unknown radio" == NULL);
}
end:
@ -2900,9 +2857,6 @@ void wlc_phy_set_deaf(wlc_phy_t *ppi, bool user_flag)
wlc_lcnphy_deaf_mode(pi, true);
else if (ISNPHY(pi))
wlc_nphy_deaf_mode(pi, true);
else {
ASSERT(0);
}
}
void wlc_phy_watchdog(wlc_phy_t *pih)
@ -3163,13 +3117,9 @@ void wlc_phy_cal_perical(wlc_phy_t *pih, u8 reason)
} else if (pi->nphy_perical == PHY_PERICAL_SPHASE)
wlc_phy_cal_perical_nphy_run(pi,
PHY_PERICAL_AUTO);
else {
ASSERT(0);
}
}
break;
default:
ASSERT(0);
break;
}
}
@ -3391,8 +3341,6 @@ u32 wlc_phy_qdiv_roundup(u32 dividend, u32 divisor, u8 precision)
{
u32 quotient, remainder, roundup, rbit;
ASSERT(divisor);
quotient = dividend / divisor;
remainder = dividend % divisor;
rbit = divisor & 1;

70
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
View File

@ -14218,8 +14218,6 @@ static void WLBANDINITFN(wlc_phy_bphy_init_nphy) (phy_info_t *pi)
{
u16 addr, val;
ASSERT(ISNPHY(pi));
val = 0x1e1f;
for (addr = (NPHY_TO_BPHY_OFF + BPHY_RSSI_LUT);
addr <= (NPHY_TO_BPHY_OFF + BPHY_RSSI_LUT_END); addr++) {
@ -14367,8 +14365,6 @@ static void WLBANDINITFN(wlc_phy_tbl_init_nphy) (phy_info_t *pi)
break;
default:
ASSERT(0);
break;
}
@ -14401,8 +14397,6 @@ static void WLBANDINITFN(wlc_phy_tbl_init_nphy) (phy_info_t *pi)
[idx]);
break;
default:
ASSERT(0);
break;
}
} else {
@ -14566,8 +14560,6 @@ void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi)
regs = (d11regs_t *) si_switch_core(pi->sh->sih, D11_CORE_ID,
&origidx, &intr_val);
ASSERT(regs != NULL);
d11_clk_ctl_st = R_REG(&regs->clk_ctl_st);
AND_REG(&regs->clk_ctl_st,
~(CCS_FORCEHT | CCS_HTAREQ));
@ -14783,10 +14775,7 @@ void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi)
rfpwr_offset = (s16)
nphy_papd_padgain_dlt_2g_2057rev7
[pad_gn];
} else {
ASSERT(0);
}
} else {
if ((pi->pubpi.radiorev == 3) ||
(pi->pubpi.radiorev == 4) ||
@ -14800,8 +14789,6 @@ void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi)
rfpwr_offset = (s16)
nphy_papd_pgagain_dlt_5g_2057rev7
[pga_gn];
} else {
ASSERT(0);
}
}
wlc_phy_table_write_nphy(pi,
@ -16130,8 +16117,6 @@ static void wlc_phy_workarounds_nphy(phy_info_t *pi)
0x18, 16, bcm_adc_vmid);
wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_AFECTRL, 4,
0x1c, 16, bcm_adc_gain);
} else {
ASSERT(0);
}
write_radio_reg(pi,
@ -17510,7 +17495,6 @@ static void wlc_phy_radio_init_2056(phy_info_t *pi)
break;
default:
ASSERT(0);
break;
}
}
@ -17571,7 +17555,6 @@ static void wlc_phy_radio_init_2057(phy_info_t *pi)
regs_2057_ptr = regs_2057_rev5v1;
} else {
ASSERT(0);
break;
}
@ -17586,11 +17569,8 @@ static void wlc_phy_radio_init_2057(phy_info_t *pi)
break;
default:
ASSERT(0);
break;
}
} else {
ASSERT(0);
}
wlc_phy_init_radio_regs_allbands(pi, regs_2057_ptr);
@ -17708,7 +17688,6 @@ wlc_phy_chan2freq_nphy(phy_info_t *pi, uint channel, int *f,
}
if (i >= tbl_len) {
ASSERT(i < tbl_len);
goto fail;
}
if (pi->pubpi.radiorev == 5) {
@ -17765,7 +17744,6 @@ wlc_phy_chan2freq_nphy(phy_info_t *pi, uint channel, int *f,
}
if (i >= tbl_len) {
ASSERT(i < tbl_len);
goto fail;
}
*t1 = &chan_info_tbl_p_1[i];
@ -17777,7 +17755,6 @@ wlc_phy_chan2freq_nphy(phy_info_t *pi, uint channel, int *f,
break;
if (i >= ARRAY_SIZE(chan_info_nphy_2055)) {
ASSERT(i < ARRAY_SIZE(chan_info_nphy_2055));
goto fail;
}
*t3 = &chan_info_nphy_2055[i];
@ -19585,8 +19562,6 @@ void wlc_phy_antsel_init(wlc_phy_t *ppi, bool lut_init)
1, 0x08, 16, &v2);
wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_ANTSWCTRLLUT,
1, 0x0C, 16, &v3);
} else {
ASSERT(0);
}
if (pi->srom_fem5g.antswctrllut == 0) {
@ -19598,8 +19573,6 @@ void wlc_phy_antsel_init(wlc_phy_t *ppi, bool lut_init)
1, 0x18, 16, &v2);
wlc_phy_table_write_nphy(pi, NPHY_TBL_ID_ANTSWCTRLLUT,
1, 0x1C, 16, &v3);
} else {
ASSERT(0);
}
} else {
@ -19718,8 +19691,6 @@ wlc_phy_set_rfseq_nphy(phy_info_t *pi, u8 cmd, u8 *events, u8 *dlys,
3) ? NPHY_REV3_RFSEQ_CMD_END : NPHY_RFSEQ_CMD_END;
u8 end_dly = 1;
ASSERT(len <= 16);
if (pi->phyhang_avoid)
wlc_phy_stay_in_carriersearch_nphy(pi, true);
@ -21503,8 +21474,6 @@ wlc_phy_rssi_compute_nphy(phy_info_t *pi, wlc_d11rxhdr_t *wlc_rxh)
rxpwr = (rxpwr0 < rxpwr1) ? rxpwr0 : rxpwr1;
else if (pi->sh->rssi_mode == RSSI_ANT_MERGE_AVG)
rxpwr = (rxpwr0 + rxpwr1) >> 1;
else
ASSERT(0);
return rxpwr;
}
@ -22233,8 +22202,6 @@ static void wlc_phy_rssi_cal_nphy_rev3(phy_info_t *pi)
static void wlc_phy_restore_rssical_nphy(phy_info_t *pi)
{
ASSERT(NREV_GE(pi->pubpi.phy_rev, 3));
if (CHSPEC_IS2G(pi->radio_chanspec)) {
if (pi->nphy_rssical_chanspec_2G == 0)
return;
@ -22775,8 +22742,6 @@ wlc_phy_iqcal_gainparams_nphy(phy_info_t *pi, u16 core_no,
}
}
ASSERT(idx != -1);
params->txgm = tbl_iqcal_gainparams_nphy[band_idx][k][1];
params->pga = tbl_iqcal_gainparams_nphy[band_idx][k][2];
params->pad = tbl_iqcal_gainparams_nphy[band_idx][k][3];
@ -23855,8 +23820,6 @@ void wlc_phy_cal_perical_nphy_run(phy_info_t *pi, u8 caltype)
if (PHY_MUTED(pi))
return;
ASSERT(pi->nphy_perical != PHY_PERICAL_DISABLE);
if (caltype == PHY_PERICAL_AUTO)
fullcal = (pi->radio_chanspec != pi->nphy_txiqlocal_chanspec);
else if (caltype == PHY_PERICAL_PARTIAL)
@ -23955,8 +23918,6 @@ void wlc_phy_cal_perical_nphy_run(phy_info_t *pi, u8 caltype)
wlc_phy_radio205x_vcocal_nphy(pi);
}
} else {
ASSERT(pi->nphy_perical >= PHY_PERICAL_MPHASE);
switch (pi->mphase_cal_phase_id) {
case MPHASE_CAL_STATE_INIT:
pi->nphy_perical_last = pi->sh->now;
@ -24052,7 +24013,6 @@ void wlc_phy_cal_perical_nphy_run(phy_info_t *pi, u8 caltype)
break;
default:
ASSERT(0);
wlc_phy_cal_perical_mphase_reset(pi);
break;
}
@ -24468,8 +24428,6 @@ static void wlc_phy_reapply_txcal_coeffs_nphy(phy_info_t *pi)
{
u16 tbl_buf[7];
ASSERT(NREV_LT(pi->pubpi.phy_rev, 2));
if ((pi->nphy_txiqlocal_chanspec == pi->radio_chanspec) &&
(pi->nphy_txiqlocal_coeffsvalid)) {
wlc_phy_table_read_nphy(pi, NPHY_TBL_ID_IQLOCAL,
@ -24547,7 +24505,6 @@ wlc_phy_rx_iq_est_nphy(phy_info_t *pi, phy_iq_est_t *est, u16 num_samps,
ASSERT((read_phy_reg(pi, 0x129) & NPHY_IqestCmd_iqstart) == 0);
if ((read_phy_reg(pi, 0x129) & NPHY_IqestCmd_iqstart) == 0) {
ASSERT(pi->pubpi.phy_corenum <= PHY_CORE_MAX);
for (core = 0; core < pi->pubpi.phy_corenum; core++) {
est[core].i_pwr =
(read_phy_reg(pi, NPHY_IqestipwrAccHi(core)) << 16)
@ -25451,7 +25408,7 @@ wlc_phy_rxcal_gainctrl_nphy_rev5(phy_info_t *pi, u8 rx_core,
break;
default:
ASSERT(0);
break;
}
if ((curr_gaintbl_index < 0) ||
@ -26270,8 +26227,6 @@ static u32 *wlc_phy_get_ipa_gaintbl_nphy(phy_info_t *pi)
tx_pwrctrl_tbl =
nphy_tpc_txgain_ipa_2g_2057rev7;
} else {
ASSERT(0);
}
} else if (NREV_IS(pi->pubpi.phy_rev, 6)) {
@ -26303,8 +26258,6 @@ static u32 *wlc_phy_get_ipa_gaintbl_nphy(phy_info_t *pi)
tx_pwrctrl_tbl =
nphy_tpc_txgain_ipa_5g_2057rev7;
} else {
ASSERT(0);
}
} else {
@ -26347,8 +26300,6 @@ wlc_phy_papd_cal_setup_nphy(phy_info_t *pi, nphy_papd_restore_state *state,
|| (pi->pubpi.radiorev == 6)) {
mixgain = 0x00;
} else {
ASSERT(0);
}
} else {
@ -26361,8 +26312,6 @@ wlc_phy_papd_cal_setup_nphy(phy_info_t *pi, nphy_papd_restore_state *state,
|| (pi->pubpi.radiorev == 8)) {
mixgain = 0x0;
} else {
ASSERT(0);
}
}
@ -26464,8 +26413,6 @@ wlc_phy_papd_cal_setup_nphy(phy_info_t *pi, nphy_papd_restore_state *state,
WRITE_RADIO_REG3(pi, RADIO_2057, TX, core,
TXRXCOUPLE_2G_ATTEN, 0xf0);
} else {
ASSERT(0);
}
WRITE_RADIO_REG3(pi, RADIO_2057, TX, off_core,
@ -26724,8 +26671,6 @@ wlc_phy_a1_nphy(phy_info_t *pi, u8 core, u32 winsz, u32 start,
u32 *buf, *src, *dst, sz;
sz = end - start + 1;
ASSERT(end > start);
ASSERT(end < NPHY_PAPD_EPS_TBL_SIZE);
buf = kmalloc(2 * sizeof(u32) * NPHY_PAPD_EPS_TBL_SIZE, GFP_ATOMIC);
if (NULL == buf) {
@ -26787,8 +26732,6 @@ wlc_phy_a2_nphy(phy_info_t *pi, nphy_ipa_txcalgains_t *txgains,
phy_a7 = (core == PHY_CORE_0) ? 1 : 0;
ASSERT((cal_mode == CAL_FULL) || (cal_mode == CAL_GCTRL)
|| (cal_mode == CAL_SOFT));
phy_a6 = ((cal_mode == CAL_GCTRL)
|| (cal_mode == CAL_SOFT)) ? true : false;
@ -27333,8 +27276,6 @@ static void wlc_phy_a4(phy_info_t *pi, bool full_cal)
nphy_papd_cal_gain_index
[phy_b5], phy_b5);
} else {
ASSERT(0);
}
phy_b1[phy_b5].gains.pad[phy_b5] =
@ -27417,8 +27358,6 @@ static void wlc_phy_a4(phy_info_t *pi, bool full_cal)
-(nphy_papd_padgain_dlt_2g_2057rev7
[phy_b8]
+ 1) / 2;
} else {
ASSERT(0);
}
} else {
phy_b7 = phy_b1[phy_b5].gains.pga[phy_b5];
@ -27435,8 +27374,6 @@ static void wlc_phy_a4(phy_info_t *pi, bool full_cal)
-(nphy_papd_pgagain_dlt_5g_2057rev7
[phy_b7]
+ 1) / 2;
} else {
ASSERT(0);
}
phy_b10 = -9;
@ -27536,8 +27473,6 @@ void wlc_phy_txpwr_fixpower_nphy(phy_info_t *pi)
u8 txpi[2], chan_freq_range;
s32 rfpwr_offset;
ASSERT(pi->nphy_txpwrctrl == PHY_TPC_HW_OFF);
if (pi->phyhang_avoid)
wlc_phy_stay_in_carriersearch_nphy(pi, true);
@ -29179,7 +29114,6 @@ wlc_phy_txpower_sromlimit_get_nphy(phy_info_t *pi, uint chan, u8 *max_pwr,
*max_pwr = pi->tx_srom_max_rate_5g_hi[txp_rate_idx];
break;
default:
ASSERT(0);
*max_pwr = pi->tx_srom_max_rate_2g[txp_rate_idx];
break;
}
@ -29207,8 +29141,6 @@ void wlc_phy_stay_in_carriersearch_nphy(phy_info_t *pi, bool enable)
wlc_phy_resetcca_nphy(pi);
} else {
ASSERT(pi->nphy_deaf_count > 0);
pi->nphy_deaf_count--;
if (pi->nphy_deaf_count == 0) {