All of lore.kernel.org
 help / color / mirror / Atom feed
From: Quytelda Kahja <quytelda@tamalin.org>
To: gregkh@linuxfoundation.org, hadess@hadess.net,
	hdegoede@redhat.com, Larry.Finger@lwfinger.net
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	Quytelda Kahja <quytelda@tamalin.org>
Subject: [PATCH 09/11] staging: rtl8723bs: Merge conditionals with similar bodies.
Date: Sat, 16 Jun 2018 22:30:38 -0700	[thread overview]
Message-ID: <20180617053040.5903-9-quytelda@tamalin.org> (raw)
In-Reply-To: <20180617053040.5903-1-quytelda@tamalin.org>

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: Quytelda Kahja <quytelda@tamalin.org>
---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index dd097df86fa3..9e6dc238c028 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -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) {
-- 
2.17.1


  parent reply	other threads:[~2018-06-17  5:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-17  5:30 [PATCH 01/11] staging: rtl8723bs: Clean up whitespace in 'PHY_GetTxPowerLimit()' Quytelda Kahja
2018-06-17  5:30 ` [PATCH 02/11] staging: rtl8723bs: Rename PHY_GetTxPowerLimit() Quytelda Kahja
2018-06-17  5:30 ` [PATCH 03/11] staging: rtl8723bs: Fix camel-case names in phy_get_tx_pwr_lmt() Quytelda Kahja
2018-06-17  5:30 ` [PATCH 04/11] staging: rtl8723bs: Combine if statements with equivalent body Quytelda Kahja
2018-06-17  5:30 ` [PATCH 05/11] staging: rtl8723bs: Remove empty else-if conditional Quytelda Kahja
2018-06-17  5:30 ` [PATCH 06/11] staging: rtl8723bs: Move rate section index lookup to new function Quytelda Kahja
2018-06-17  5:30 ` [PATCH 07/11] staging: rtl8723bs: Move bandwidth " Quytelda Kahja
2018-06-17  5:30 ` [PATCH 08/11] staging: rtl8723bs: Fix spelling mistake in comment Quytelda Kahja
2018-06-17  5:30 ` Quytelda Kahja [this message]
2018-06-17  5:30 ` [PATCH 10/11] staging: rtl8723bs: Merge workaround conditionals into single else-if Quytelda Kahja
2018-06-17  5:30 ` [PATCH 11/11] staging: rtl8723bs: Add missing curly braces on else statement Quytelda Kahja

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180617053040.5903-9-quytelda@tamalin.org \
    --to=quytelda@tamalin.org \
    --cc=Larry.Finger@lwfinger.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hadess@hadess.net \
    --cc=hdegoede@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.