public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
From: Andrei Khomenkov <khomenkov@mailbox.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev
Subject: [PATCH v6 6/8] staging: rtl8723bs: move logical operators to previous line
Date: Mon, 27 Apr 2026 20:58:44 +0300	[thread overview]
Message-ID: <20260427175846.23470-7-khomenkov@mailbox.org> (raw)
In-Reply-To: <20260427175846.23470-1-khomenkov@mailbox.org>

Move logical operators to the previous line to improve code
readability and conform to the Linux kernel coding style.
This fixes the LOGICAL_CONTINUATIONS issues identified by
checkpatch.pl.

Signed-off-by: Andrei Khomenkov <khomenkov@mailbox.org>
---
 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c    | 4 ++--
 drivers/staging/rtl8723bs/core/rtw_mlme.c         | 4 ++--
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 7cbfd0fc20ed..b5a363df7eb7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -470,8 +470,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
 	struct sta_info *psta = NULL;
 	u8 short_GI = 0;
 
-	if (!check_fwstate(pmlmepriv, _FW_LINKED)
-		&& !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
+	if (!check_fwstate(pmlmepriv, _FW_LINKED) &&
+		!check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
 		return 0;
 
 	psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 14a6d0e2a3c1..3c4c7d902295 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1757,8 +1757,8 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
 		goto exit;
 
 	if (rtw_to_roam(adapter) > 0) {
-		if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms
-			|| !is_same_ess(&competitor->network, &mlme->cur_network.network)
+		if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms ||
+			!is_same_ess(&competitor->network, &mlme->cur_network.network)
 		)
 			goto exit;
 	}
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 9453180fbb0e..de7b3179afdf 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -899,8 +899,8 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct wireless_dev *wdev,
 			memcpy(param->sta_addr, mac_addr, ETH_ALEN);
 
 		ret = rtw_cfg80211_ap_set_encryption(ndev, param, param_len);
-	} else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)
-		|| check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+	} else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
+		   check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
 		ret =  rtw_cfg80211_set_encryption(ndev, param, param_len);
 	}
 
-- 
2.53.0


  parent reply	other threads:[~2026-04-27 17:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-27 17:58 [PATCH v6 0/8] staging: rtl8723bs: simplify booleans and cleanup style Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 1/8] staging: rtl8723bs: core: simplify boolean comparisons Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 2/8] staging: rtl8723bs: hal: " Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 3/8] staging: rtl8723bs: os_dep: " Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 4/8] staging: rtl8723bs: add spaces around bitwise OR operators Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 5/8] staging: rtl8723bs: remove redundant braces for single-statement block Andrei Khomenkov
2026-04-27 17:58 ` Andrei Khomenkov [this message]
2026-04-27 17:58 ` [PATCH v6 7/8] staging: rtl8723bs: fix alignment of continued conditions Andrei Khomenkov
2026-04-27 17:58 ` [PATCH v6 8/8] staging: rtl8723bs: wrap lines exceeding 100 characters Andrei Khomenkov

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=20260427175846.23470-7-khomenkov@mailbox.org \
    --to=khomenkov@mailbox.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-staging@lists.linux.dev \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox