Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5746848 authored by Quytelda Kahja's avatar Quytelda Kahja Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Merge conditionals with similar bodies. 



Two conditionals that set 'channel' based on 'band_type' in
'phy_get_tx_pwr_lmt()' can be simplified into one single-line conditional.

Signed-off-by: default avatarQuytelda Kahja <quytelda@tamalin.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 871081d4

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c

+2 −6
Original line number Diff line number Diff line
@@ -1738,12 +1738,8 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, 
		idx_bandwidth = 1;

	}



	if (band_type == BAND_ON_2_4G)

		channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_2_4G,

							    channel);

	else if (band_type == BAND_ON_5G)

		channel = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_5G,

							    channel);

	if (band_type == BAND_ON_2_4G || band_type == BAND_ON_5G)

		channel = phy_GetChannelIndexOfTxPowerLimit(band_type, channel);



	if (idx_band == -1 || idx_regulation == -1 || idx_bandwidth == -1 ||

	    idx_rate_sctn == -1 || idx_channel == -1) {