Re: [PATCH AUTOSEL 5.15 24/51] staging: rtl8723bs: Fix alignment to match open parenthesis

[Joe Perches]

On Tue, 2022-06-07 at 13:55 -0400, Sasha Levin wrote:
> From: Soumya Negi <soumya.negi97@xxxxxxxxx>
> 
> [ Upstream commit f722d67fad290b0c960f27062adc8cf59488d0a7 ]
> 
> Adhere to Linux coding style. Fixes checkpatch warnings:
> CHECK: Alignment should match open parenthesis
> CHECK: line length of 101 exceeds 100 columns

why should this be backported?  It's only whitespace changes.

And beyond that, it's incomplete as it only realigns the second line of
statements that span 3 lines.

> 
> Signed-off-by: Soumya Negi <soumya.negi97@xxxxxxxxx>
> Link: https://lore.kernel.org/r/20220513025553.13634-1-soumya.negi97@xxxxxxxxx
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
>  drivers/staging/rtl8723bs/core/rtw_ap.c | 24 +++++++++++++-----------
>  1 file changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
> index 6064dd6a76b4..43cd90dc9017 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ap.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
> @@ -519,12 +519,12 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
>  
>  		/*  B0 Config LDPC Coding Capability */
>  		if (TEST_FLAG(phtpriv_ap->ldpc_cap, LDPC_HT_ENABLE_TX) &&
> -			      GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap)))
> +		    GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap)))
>  			SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX));
>  
>  		/*  B7 B8 B9 Config STBC setting */
>  		if (TEST_FLAG(phtpriv_ap->stbc_cap, STBC_HT_ENABLE_TX) &&
> -			      GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap)))
> +		    GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap)))
>  			SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX));
>  	} else {
>  		phtpriv_sta->ampdu_enable = false;
> @@ -1064,10 +1064,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
>  		);
>  
>  		if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
> -		     (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP)) {
> -			pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 << 2));
> +		    (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP)) {
> +			pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &
> +						       (0x07 << 2));
>  		} else {
> -			pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & 0x00);
> +			pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &
> +						       0x00);
>  		}
>  
>  		rtw_hal_get_def_var(
> @@ -1115,7 +1117,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
>  	pmlmepriv->htpriv.ht_option = false;
>  
>  	if ((psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_TKIP) ||
> -	     (psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_TKIP)) {
> +	    (psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_TKIP)) {
>  		/* todo: */
>  		/* ht_cap = false; */
>  	}
> @@ -1724,7 +1726,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
>  			pmlmepriv->num_sta_no_short_preamble--;
>  
>  			if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
> -				(pmlmepriv->num_sta_no_short_preamble == 0)) {
> +			    (pmlmepriv->num_sta_no_short_preamble == 0)) {
>  				beacon_updated = true;
>  				update_beacon(padapter, 0xFF, NULL, true);
>  			}
> @@ -1762,7 +1764,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
>  			pmlmepriv->num_sta_no_short_slot_time++;
>  
>  			if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
> -				 (pmlmepriv->num_sta_no_short_slot_time == 1)) {
> +			    (pmlmepriv->num_sta_no_short_slot_time == 1)) {
>  				beacon_updated = true;
>  				update_beacon(padapter, 0xFF, NULL, true);
>  			}
> @@ -1774,7 +1776,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
>  			pmlmepriv->num_sta_no_short_slot_time--;
>  
>  			if ((pmlmeext->cur_wireless_mode > WIRELESS_11B) &&
> -				 (pmlmepriv->num_sta_no_short_slot_time == 0)) {
> +			    (pmlmepriv->num_sta_no_short_slot_time == 0)) {
>  				beacon_updated = true;
>  				update_beacon(padapter, 0xFF, NULL, true);
>  			}
> @@ -2023,7 +2025,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
>  	start_bss_network(padapter);
>  
>  	if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
> -		(padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {
> +	    (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {
>  		/* restore group key, WEP keys is restored in ips_leave() */
>  		rtw_set_key(
>  			padapter,
> @@ -2061,7 +2063,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
>  			/* pairwise key */
>  			/* per sta pairwise key and settings */
>  			if ((psecuritypriv->dot11PrivacyAlgrthm == _TKIP_) ||
> -				(psecuritypriv->dot11PrivacyAlgrthm == _AES_)) {
> +			    (psecuritypriv->dot11PrivacyAlgrthm == _AES_)) {
>  				rtw_setstakey_cmd(padapter, psta, true, false);
>  			}
>  		}