From 904604397d163ca391862b7c71d3387416463aab Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Sat, 16 Jun 2018 22:30:39 -0700 Subject: [PATCH] staging: rtl8723bs: Merge workaround conditionals into single else-if. The if conditionals used to work around wrong TX power limit indices can be condensed into a single if/else-if statement for more concise expression. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c index 9e6dc238c028..0e49f0973c12 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -1728,15 +1728,12 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, /* workaround for wrong index combination to obtain tx power limit, */ /* OFDM only exists in BW 20M */ /* CCK table will only be given in BW 20M */ + /* HT on 80M will reference to HT on 40M */ if (idx_rate_sctn == 0 || idx_rate_sctn == 1) idx_bandwidth = 0; - - /* workaround for wrong index combination to obtain tx power limit, */ - /* HT on 80M will reference to HT on 40M */ - if ((idx_rate_sctn == 2 || idx_rate_sctn == 3) && - band_type == BAND_ON_5G && idx_bandwidth == 2) { + else if ((idx_rate_sctn == 2 || idx_rate_sctn == 3) && + (band_type == BAND_ON_5G) && (idx_bandwidth == 2)) idx_bandwidth = 1; - } if (band_type == BAND_ON_2_4G || band_type == BAND_ON_5G) channel = phy_GetChannelIndexOfTxPowerLimit(band_type, channel); -- 2.11.0