[v1] staging: rtl8723bs: Fix logical continuation placement

[PATCH] staging: rtl8723bs: Fix logical continuation placement

Posted by Mariyam Shahid 1 month, 1 week ago

Move logical operators to the end of the previous line
to fix checkpatch warnings.

Signed-off-by: Mariyam Shahid <mariyam.shahid135@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_ap.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 3e62fc8f61cf..004730d5f98c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1573,8 +1573,8 @@ static int rtw_ht_operation_update(struct adapter *padapter)
 	if (pmlmepriv->htpriv.ht_option)
 		return 0;
 
-	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)
-	    && pmlmepriv->num_sta_ht_no_gf) {
+	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
+	      pmlmepriv->num_sta_ht_no_gf) {
 		pmlmepriv->ht_op_mode |=
 			IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT;
 		op_mode_changes++;
@@ -1780,8 +1780,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
 	if (psta->no_short_preamble_set) {
 		psta->no_short_preamble_set = 0;
 		pmlmepriv->num_sta_no_short_preamble--;
-		if (pmlmeext->cur_wireless_mode > WIRELESS_11B
-		    && pmlmepriv->num_sta_no_short_preamble == 0){
+		if (pmlmeext->cur_wireless_mode > WIRELESS_11B &&
+		    pmlmepriv->num_sta_no_short_preamble == 0){
 			beacon_updated = true;
 			update_beacon(padapter, 0xFF, NULL, true);
 		}
@@ -1799,8 +1799,8 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
 	if (psta->no_short_slot_time_set) {
 		psta->no_short_slot_time_set = 0;
 		pmlmepriv->num_sta_no_short_slot_time--;
-		if (pmlmeext->cur_wireless_mode > WIRELESS_11B
-		    && pmlmepriv->num_sta_no_short_slot_time == 0){
+		if (pmlmeext->cur_wireless_mode > WIRELESS_11B &&
+		    pmlmepriv->num_sta_no_short_slot_time == 0){
 			beacon_updated = true;
 			update_beacon(padapter, 0xFF, NULL, true);
 		}
-- 
2.43.0

Re: [PATCH] staging: rtl8723bs: Fix logical continuation placement

Posted by Ethan Tidmore 1 month, 1 week ago

On Thu Feb 26, 2026 at 3:38 AM CST, Mariyam Shahid wrote:
> Move logical operators to the end of the previous line
> to fix checkpatch warnings.
>
> Signed-off-by: Mariyam Shahid <mariyam.shahid135@gmail.com>
> ---

...


> -	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)
> -	    && pmlmepriv->num_sta_ht_no_gf) {
> +	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
> +	      pmlmepriv->num_sta_ht_no_gf) {

This should be:

	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
		pmlmepriv->num_sta_ht_no_gf) {

Also, my email is "ethantidmore06@gmail.com" I believe you used a wrong
email.

Thanks,

ET

Re: [PATCH] staging: rtl8723bs: Fix logical continuation placement

Posted by Dan Carpenter 1 month, 1 week ago

On Thu, Feb 26, 2026 at 07:31:34PM -0600, Ethan Tidmore wrote:
> On Thu Feb 26, 2026 at 3:38 AM CST, Mariyam Shahid wrote:
> > Move logical operators to the end of the previous line
> > to fix checkpatch warnings.
> >
> > Signed-off-by: Mariyam Shahid <mariyam.shahid135@gmail.com>
> > ---
> 
> ...
> 
> 
> > -	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)
> > -	    && pmlmepriv->num_sta_ht_no_gf) {
> > +	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
> > +	      pmlmepriv->num_sta_ht_no_gf) {
> 
> This should be:
> 
> 	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
> 		pmlmepriv->num_sta_ht_no_gf) {

Ideally, it would be aligned.

	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
	    pmlmepriv->num_sta_ht_no_gf) {

[tab][space * 4]pmlmepriv->num_sta_ht_no_gf) {

regards,
dan carpenter

Re: [PATCH] staging: rtl8723bs: Fix logical continuation placement

Posted by Ethan Tidmore 1 month, 1 week ago

On Fri Feb 27, 2026 at 1:12 AM CST, Dan Carpenter wrote:
> On Thu, Feb 26, 2026 at 07:31:34PM -0600, Ethan Tidmore wrote:
>> On Thu Feb 26, 2026 at 3:38 AM CST, Mariyam Shahid wrote:
>> > Move logical operators to the end of the previous line
>> > to fix checkpatch warnings.
>> >
>> > Signed-off-by: Mariyam Shahid <mariyam.shahid135@gmail.com>

...


> Ideally, it would be aligned.
>
> 	if (!(pmlmepriv->ht_op_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) &&
> 	    pmlmepriv->num_sta_ht_no_gf) {
>
> [tab][space * 4]pmlmepriv->num_sta_ht_no_gf) {

That's what I meant I guess my email client mangled it? I'll just
demonstrate it like you did here for now on.

Thanks,

ET