* [PATCH] staging: rtl8723bs: put logical continuation on previous line in rtw_mlme.c
@ 2026-06-21 15:00 Dalvin-Ehinoma Noah Aiguobas
2026-07-07 11:24 ` Greg KH
2026-07-11 14:23 ` [PATCH v2] staging: rtl8723bs: Fix logical operator alignment " Dalvin-Ehinoma Noah Aiguobas
0 siblings, 2 replies; 3+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-06-21 15:00 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel
Move logical operators from continuation lines to the previous line
to conform to the linux kernel coding style.
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 4fb74729180f..e3a17b5cbbf4 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -342,8 +342,8 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)
inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
{
- return (a->ssid.ssid_length == b->ssid.ssid_length)
- && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
+ return (a->ssid.ssid_length == b->ssid.ssid_length) &&
+ !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
}
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feature)
@@ -751,8 +751,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
}
} else {
if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
- if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
- && check_fwstate(pmlmepriv, _FW_LINKED)) {
+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+ check_fwstate(pmlmepriv, _FW_LINKED)) {
if (rtw_select_roaming_candidate(pmlmepriv) == _SUCCESS) {
receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address
, WLAN_REASON_ACTIVE_ROAM);
@@ -925,8 +925,7 @@ void rtw_scan_abort(struct adapter *adapter)
start = jiffies;
pmlmeext->scan_abort = true;
- while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
- && jiffies_to_msecs(start) <= 200) {
+ while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && jiffies_to_msecs(start) <= 200) {
if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break;
@@ -1574,8 +1573,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
rtw_mlme_reset_auto_scan_int(padapter);
- if (pmlmepriv->auto_scan_int_ms != 0
- && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {
+ if (pmlmepriv->auto_scan_int_ms != 0 &&
+ jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {
if (!padapter->registrypriv.wifi_spec) {
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING))
goto exit;
@@ -1605,8 +1604,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if (adapter->net_closed)
return;
- if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)
- && !(hal_btcoex_IsBtControlLps(adapter))
+ if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) &&
+ !(hal_btcoex_IsBtControlLps(adapter))
) {
bool should_enter_ps;
@@ -1750,8 +1749,8 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
/* check ssid, if needed */
if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) {
- if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length
- || memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)
+ if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length ||
+ memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)
)
goto exit;
}
--
2.54.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] staging: rtl8723bs: put logical continuation on previous line in rtw_mlme.c
2026-06-21 15:00 [PATCH] staging: rtl8723bs: put logical continuation on previous line in rtw_mlme.c Dalvin-Ehinoma Noah Aiguobas
@ 2026-07-07 11:24 ` Greg KH
2026-07-11 14:23 ` [PATCH v2] staging: rtl8723bs: Fix logical operator alignment " Dalvin-Ehinoma Noah Aiguobas
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2026-07-07 11:24 UTC (permalink / raw)
To: Dalvin-Ehinoma Noah Aiguobas; +Cc: linux-staging, linux-kernel
On Sun, Jun 21, 2026 at 03:00:56PM +0000, Dalvin-Ehinoma Noah Aiguobas wrote:
> Move logical operators from continuation lines to the previous line
> to conform to the linux kernel coding style.
>
> Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 4fb74729180f..e3a17b5cbbf4 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -342,8 +342,8 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)
>
> inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
> {
> - return (a->ssid.ssid_length == b->ssid.ssid_length)
> - && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
> + return (a->ssid.ssid_length == b->ssid.ssid_length) &&
> + !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
> }
>
> int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feature)
> @@ -751,8 +751,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
> }
> } else {
> if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
> - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
> - && check_fwstate(pmlmepriv, _FW_LINKED)) {
> + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
> + check_fwstate(pmlmepriv, _FW_LINKED)) {
> if (rtw_select_roaming_candidate(pmlmepriv) == _SUCCESS) {
> receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address
> , WLAN_REASON_ACTIVE_ROAM);
> @@ -925,8 +925,7 @@ void rtw_scan_abort(struct adapter *adapter)
>
> start = jiffies;
> pmlmeext->scan_abort = true;
> - while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
> - && jiffies_to_msecs(start) <= 200) {
> + while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && jiffies_to_msecs(start) <= 200) {
While it's great you made this change, it doesn't match up with what you
wrote in the description of the patch :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v2] staging: rtl8723bs: Fix logical operator alignment in rtw_mlme.c
2026-06-21 15:00 [PATCH] staging: rtl8723bs: put logical continuation on previous line in rtw_mlme.c Dalvin-Ehinoma Noah Aiguobas
2026-07-07 11:24 ` Greg KH
@ 2026-07-11 14:23 ` Dalvin-Ehinoma Noah Aiguobas
1 sibling, 0 replies; 3+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-07-11 14:23 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-staging, Dalvin-Ehinoma Noah Aiguobas
Move logical operators to the end of continuation lines and adjust
indentation in rtw_mlme.c to comply with the Linux kernel coding style.
Change v2:
- Rebased against current origin/staging-testing
- Changed subject and patch description
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index aaac09100fe3..1ffd1d2fc7f5 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -342,8 +342,8 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)
inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
{
- return (a->ssid.ssid_length == b->ssid.ssid_length)
- && !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
+ return (a->ssid.ssid_length == b->ssid.ssid_length) &&
+ !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);
}
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feature)
@@ -755,8 +755,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
}
} else {
if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
- if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
- && check_fwstate(pmlmepriv, _FW_LINKED)) {
+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
+ check_fwstate(pmlmepriv, _FW_LINKED)) {
if (rtw_select_roaming_candidate(pmlmepriv) == _SUCCESS) {
receive_disconnect(adapter, pmlmepriv->cur_network.network.mac_address
, WLAN_REASON_ACTIVE_ROAM);
@@ -928,8 +928,7 @@ void rtw_scan_abort(struct adapter *adapter)
start = jiffies;
pmlmeext->scan_abort = true;
- while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
- && jiffies_to_msecs(start) <= 200) {
+ while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) && jiffies_to_msecs(start) <= 200) {
if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break;
@@ -1578,8 +1577,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
rtw_mlme_reset_auto_scan_int(padapter);
- if (pmlmepriv->auto_scan_int_ms != 0
- && jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {
+ if (pmlmepriv->auto_scan_int_ms != 0 &&
+ jiffies_to_msecs(jiffies - pmlmepriv->scan_start_time) > pmlmepriv->auto_scan_int_ms) {
if (!padapter->registrypriv.wifi_spec) {
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING))
goto exit;
@@ -1609,8 +1608,8 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if (adapter->net_closed)
return;
- if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode)
- && !(hal_btcoex_IsBtControlLps(adapter))
+ if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) &&
+ !(hal_btcoex_IsBtControlLps(adapter))
) {
bool should_enter_ps;
@@ -1754,8 +1753,8 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
/* check ssid, if needed */
if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) {
- if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length
- || memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)
+ if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length ||
+ memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)
)
goto exit;
}
--
2.54.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-07-11 14:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-21 15:00 [PATCH] staging: rtl8723bs: put logical continuation on previous line in rtw_mlme.c Dalvin-Ehinoma Noah Aiguobas
2026-07-07 11:24 ` Greg KH
2026-07-11 14:23 ` [PATCH v2] staging: rtl8723bs: Fix logical operator alignment " Dalvin-Ehinoma Noah Aiguobas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox