Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a221cb09 authored by Frank A. Cancio Bello's avatar Frank A. Cancio Bello Committed by Greg Kroah-Hartman
Browse files

staging: rtlwifi: Remove unnecessary parentheses 



Remove unnecessary parentheses to comply with preferred coding style for
the linux kernel and avoid the following checkpatch's message:
'CHECK: Unnecessary parentheses around'.

Credits to checkpatch.

Signed-off-by: default avatarFrank A. Cancio Bello <frank@generalsoftwareinc.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df0f0e71

drivers/staging/rtlwifi/base.c

+15 −15
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static void _rtl_query_shortgi(struct ieee80211_hw *hw, 
	sgi_20 = sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20;

	sgi_80 = sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80;



	if ((!sta->ht_cap.ht_supported) && (!sta->vht_cap.vht_supported))

	if (!sta->ht_cap.ht_supported && !sta->vht_cap.vht_supported)

		return;



	if (!sgi_40 && !sgi_20)
@@ -734,10 +734,10 @@ u8 rtl_mrate_idx_to_arfr_id( 
		ret = RATEID_IDX_B;

		break;

	case RATR_INX_WIRELESS_MC:

		if ((wirelessmode == WIRELESS_MODE_B) ||

		    (wirelessmode == WIRELESS_MODE_G) ||

		    (wirelessmode == WIRELESS_MODE_N_24G) ||

		    (wirelessmode == WIRELESS_MODE_AC_24G))

		if (wirelessmode == WIRELESS_MODE_B ||

		    wirelessmode == WIRELESS_MODE_G ||

		    wirelessmode == WIRELESS_MODE_N_24G ||

		    wirelessmode == WIRELESS_MODE_AC_24G)

			ret = RATEID_IDX_BG;

		else

			ret = RATEID_IDX_G;
@@ -948,8 +948,8 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw, 
	struct rtl_phy *rtlphy = &rtlpriv->phy;

	u8 hw_rate;



	if ((get_rf_type(rtlphy) == RF_2T2R) &&

	    (sta->ht_cap.mcs.rx_mask[1] != 0))

	if (get_rf_type(rtlphy) == RF_2T2R &&

	    sta->ht_cap.mcs.rx_mask[1] != 0)

		hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS15];

	else

		hw_rate = rtlpriv->cfg->maps[RTL_RC_HT_RATEMCS7];
@@ -1277,7 +1277,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, 
				tcb_desc->hw_rate =

				_rtl_get_vht_highest_n_rate(hw, sta);

			} else {

				if (sta && (sta->ht_cap.ht_supported)) {

				if (sta && sta->ht_cap.ht_supported) {

					tcb_desc->hw_rate =

					    _rtl_get_highest_n_rate(hw, sta);

				} else {
@@ -2080,9 +2080,9 @@ void rtl_watchdog_wq_callback(void *data) 
		    rtlpriv->btcoexist.btc_ops->btc_is_bt_ctrl_lps(rtlpriv))

			goto label_lps_done;



		if (((rtlpriv->link_info.num_rx_inperiod +

		      rtlpriv->link_info.num_tx_inperiod) > 8) ||

		    (rtlpriv->link_info.num_rx_inperiod > 2))

		if (rtlpriv->link_info.num_rx_inperiod +

		      rtlpriv->link_info.num_tx_inperiod > 8 ||

		    rtlpriv->link_info.num_rx_inperiod > 2)

			rtl_lps_leave(hw);

		else

			rtl_lps_enter(hw);
@@ -2551,8 +2551,8 @@ bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, unsigned int len) 
	bcn_key.valid = true;



	/* update cur_beacon_keys or compare beacon key */

	if ((rtlpriv->mac80211.link_state != MAC80211_LINKED) &&

	    (rtlpriv->mac80211.link_state != MAC80211_LINKED_SCANNING))

	if (rtlpriv->mac80211.link_state != MAC80211_LINKED &&

	    rtlpriv->mac80211.link_state != MAC80211_LINKED_SCANNING)

		return true;



	if (!cur_bcn_key->valid) {
@@ -2575,8 +2575,8 @@ bool rtl_check_beacon_key(struct ieee80211_hw *hw, void *data, unsigned int len) 
		goto chk_exit;

	}



	if ((cur_bcn_key->bcn_channel == bcn_key.bcn_channel) &&

	    (cur_bcn_key->ht_cap_info == bcn_key.ht_cap_info)) {

	if (cur_bcn_key->bcn_channel == bcn_key.bcn_channel &&

	    cur_bcn_key->ht_cap_info == bcn_key.ht_cap_info) {

		/* Beacon HT info IE, secondary channel offset check */

		/* 40M -> 20M */

		if (cur_bcn_key->ht_info_infos_0_sco >

drivers/staging/rtlwifi/core.c

+12 −12
Original line number Diff line number Diff line
@@ -302,9 +302,9 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw, 
	mutex_lock(&rtlpriv->locks.conf_mutex);



	/* Free beacon resources */

	if ((vif->type == NL80211_IFTYPE_AP) ||

	    (vif->type == NL80211_IFTYPE_ADHOC) ||

	    (vif->type == NL80211_IFTYPE_MESH_POINT)) {

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MESH_POINT) {

		if (mac->beacon_enabled == 1) {

			mac->beacon_enabled = 0;

			rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -820,8 +820,8 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw, 
	 * here just used for linked scanning, & linked

	 * and nolink check bssid is set in set network_type

	 */

	if ((changed_flags & FIF_BCN_PRBRESP_PROMISC) &&

	    (mac->link_state >= MAC80211_LINKED)) {

	if (changed_flags & FIF_BCN_PRBRESP_PROMISC &&

	    mac->link_state >= MAC80211_LINKED) {

		if (mac->opmode != NL80211_IFTYPE_AP &&

		    mac->opmode != NL80211_IFTYPE_MESH_POINT) {

			if (*new_flags & FIF_BCN_PRBRESP_PROMISC)
@@ -1042,10 +1042,10 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));



	mutex_lock(&rtlpriv->locks.conf_mutex);

	if ((vif->type == NL80211_IFTYPE_ADHOC) ||

	    (vif->type == NL80211_IFTYPE_AP) ||

	    (vif->type == NL80211_IFTYPE_MESH_POINT)) {

		if ((changed & BSS_CHANGED_BEACON) ||

	if (vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_MESH_POINT) {

		if (changed & BSS_CHANGED_BEACON ||

		    (changed & BSS_CHANGED_BEACON_ENABLED &&

		     bss_conf->enable_beacon)) {

			if (mac->beacon_enabled == 0) {
@@ -1585,8 +1585,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
		return -ENOSPC;	/*User disabled HW-crypto */

	}

	/* To support IBSS, use sw-crypto for GTK */

	if (((vif->type == NL80211_IFTYPE_ADHOC) ||

	     (vif->type == NL80211_IFTYPE_MESH_POINT)) &&

	if ((vif->type == NL80211_IFTYPE_ADHOC ||

	     vif->type == NL80211_IFTYPE_MESH_POINT) &&

	    !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))

		return -ENOSPC;

	RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
@@ -1661,7 +1661,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			rtlpriv->cfg->ops->enable_hw_sec(hw);

		}

	} else {

		if ((!group_key) || (vif->type == NL80211_IFTYPE_ADHOC) ||

		if (!group_key || vif->type == NL80211_IFTYPE_ADHOC ||

		    rtlpriv->sec.pairwise_enc_algorithm == NO_ENCRYPTION) {

			if (rtlpriv->sec.pairwise_enc_algorithm ==

			    NO_ENCRYPTION &&

drivers/staging/rtlwifi/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ void _rtl_dbg_trace(struct rtl_priv *rtlpriv, u64 comp, int level, 
		    const char *fmt, ...)

{

	if (unlikely((comp & rtlpriv->cfg->mod_params->debug_mask) &&

		     (level <= rtlpriv->cfg->mod_params->debug_level))) {

		     level <= rtlpriv->cfg->mod_params->debug_level)) {

		struct va_format vaf;

		va_list args;
@@ -52,7 +52,7 @@ void _rtl_dbg_print(struct rtl_priv *rtlpriv, u64 comp, int level, 
		    const char *fmt, ...)

{

	if (unlikely((comp & rtlpriv->cfg->mod_params->debug_mask) &&

		     (level <= rtlpriv->cfg->mod_params->debug_level))) {

		     level <= rtlpriv->cfg->mod_params->debug_level)) {

		struct va_format vaf;

		va_list args;

drivers/staging/rtlwifi/rc.c

+6 −6
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv, 
	}

	rate->count = tries;

	rate->idx = rix >= 0x00 ? rix : 0x00;

	if (((rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE) ||

	     (rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8822BE)) &&

	if ((rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8812AE ||

	     rtlpriv->rtlhal.hw_type == HARDWARE_TYPE_RTL8822BE) &&

	    wireless_mode == WIRELESS_MODE_AC_5G)

		rate->idx |= 0x10;/*2NSS for 8812AE, 8822BE*/
@@ -138,7 +138,7 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv, 
			if (sta && (sta->ht_cap.cap &

				    IEEE80211_HT_CAP_SUP_WIDTH_20_40))

				rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;

			if (sta && (sta->vht_cap.vht_supported))

			if (sta && sta->vht_cap.vht_supported)

				rate->flags |= IEEE80211_TX_RC_80_MHZ_WIDTH;

		} else {

			if (mac->bw_80)
@@ -150,8 +150,8 @@ static void _rtl_rc_rate_set_series(struct rtl_priv *rtlpriv, 
		if (sgi_20 || sgi_40 || sgi_80)

			rate->flags |= IEEE80211_TX_RC_SHORT_GI;

		if (sta && sta->ht_cap.ht_supported &&

		    ((wireless_mode == WIRELESS_MODE_N_5G) ||

		     (wireless_mode == WIRELESS_MODE_N_24G)))

		    (wireless_mode == WIRELESS_MODE_N_5G ||

		     wireless_mode == WIRELESS_MODE_N_24G))

			rate->flags |= IEEE80211_TX_RC_MCS;

		if (sta && sta->vht_cap.vht_supported &&

		    (wireless_mode == WIRELESS_MODE_AC_5G ||
@@ -232,7 +232,7 @@ static void rtl_tx_status(void *ppriv, 
	if (sta) {

		/* Check if aggregation has to be enabled for this tid */

		sta_entry = (struct rtl_sta_info *)sta->drv_priv;

		if ((sta->ht_cap.ht_supported) &&

		if (sta->ht_cap.ht_supported &&

		    !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {

			if (ieee80211_is_data_qos(fc)) {

				u8 tid = rtl_get_tid(skb);