rtlwifi: Remove unnecessary parentheses

This is merged by Ping-Ke Shih from commit a221cb0911b8 ("staging:
rtlwifi: Remove unnecessary parentheses"), and original commit log
is reserved below.

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: Frank A. Cancio Bello <frank@generalsoftwareinc.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index c01c5ca767a452301e845dbc0b146ecbcab71087..5605fa14aa4c48f50b9c5fc001dceed78d4a4483 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -859,8 +859,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];
@@ -1180,7 +1180,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 {
@@ -1976,9 +1976,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);

diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index ac606d678ee3fb2f679b236da32a9c4b392ae60a..a78b828f531a4e027b0244d2800f80e7e82d0ef1 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -345,9 +345,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,
@@ -858,8 +858,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)
@@ -1044,10 +1044,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) {
@@ -1513,9 +1513,9 @@ 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)) &&
-          !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
+       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,
                 "%s hardware based encryption for keyidx: %d, mac: %pM\n",
@@ -1588,7 +1588,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 &&

diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c
index 38fef6dbb44b61573fece5a1d740f0ecdf8c431a..c4e1da887941d5833003922e540ae3fb7af9a374 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/debug.c
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -31,7 +31,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;
 
@@ -51,7 +51,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;
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rc.c b/drivers/net/wireless/realtek/rtlwifi/rc.c
index 9638bf4a96f7f8ce3fb2a6c09d1e18276465a761..d1cb7d405618f8795ff26442c4ae6337b23bf4eb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rc.c
@@ -123,7 +123,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_40)
@@ -135,8 +135,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 ||
@@ -216,8 +216,8 @@ 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) &&
+               sta_entry = (struct rtl_sta_info *)sta->drv_priv;
+               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);