staging: brcm80211: remove checkpatch warnings 'suspect code indent'

The driver sources contained a couple of checkpatch warnings of the
given class. These have been cleaned up.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 17a6bf03fce8cb4835b08d968b8c6da998cb0fac..12c6ee35456e242f4203d9f175acb0c82c664e6b 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3605,8 +3605,7 @@ brcmf_enq_event(struct brcmf_cfg80211_priv *cfg_priv, u32 event,
 
        e->etype = event;
        memcpy(&e->emsg, msg, sizeof(struct brcmf_event_msg));
-       if (data) {
-       }
+
        brcmf_lock_eq(cfg_priv);
        list_add_tail(&e->eq_list, &cfg_priv->eq_list);
        brcmf_unlock_eq(cfg_priv);

diff --git a/drivers/staging/brcm80211/brcmsmac/bmac.c b/drivers/staging/brcm80211/brcmsmac/bmac.c
index 6f1203cb1107714c41165bf813f961a02f3bdbef..412611ec077797a9b9428f13826119e17f4eb34e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/bmac.c
@@ -318,10 +318,6 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                brcms_c_update_beacon(wlc);
        }
 
-       /* PMQ entry addition */
-       if (macintstatus & MI_PMQ) {
-       }
-
        /* tx status */
        if (macintstatus & MI_TFS) {
                if (brcms_b_txstatus(wlc->hw, bounded, &fatal))

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index 8850d6d2e133e42353ad2981c3cc2a53b0e312db..c4e90694bcfe147b96fcb583d7e7f35c3b0d50e7 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -2249,8 +2249,7 @@ wlc_phy_txpower_get_current(struct brcms_phy_pub *ppi, struct tx_power *power,
 
                power->tx_power_max_rate_ind[0] = pi->tx_power_max_rate_ind;
                power->tx_power_max_rate_ind[1] = pi->tx_power_max_rate_ind;
-       } else if (!pi->hwpwrctrl) {
-       } else if (pi->sh->up) {
+       } else if (pi->hwpwrctrl && pi->sh->up) {
 
                wlc_phyreg_enter(ppi);
                if (ISLCNPHY(pi)) {

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
index bc66c7fbb01e09c7b84a0061f767fd49ea61f74a..151dc3c90fe90ff47d820d20e7c9adb321097bca 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
@@ -20996,10 +20996,8 @@ s16 wlc_phy_tempsense_nphy(struct brcms_phy *pi)
                write_radio_reg(pi, RADIO_2056_SYN_TEMPPROCSENSE, 0x01);
 
                wlc_phy_poll_rssi_nphy(pi, NPHY_RSSI_SEL_IQ, radio_temp, 1);
-               if (NREV_GE(pi->pubpi.phy_rev, 7)) {
-               } else {
+               if (NREV_LT(pi->pubpi.phy_rev, 7))
                        write_radio_reg(pi, RADIO_2056_SYN_TEMPPROCSENSE, 0x05);
-               }
 
                wlc_phy_poll_rssi_nphy(pi, NPHY_RSSI_SEL_IQ, radio_temp2, 1);
                if (NREV_GE(pi->pubpi.phy_rev, 7)) {
@@ -24578,7 +24576,6 @@ static void wlc_phy_calc_rx_iq_comp_nphy(struct brcms_phy *pi, u8 core_mask)
                }
 
                new_comp = old_comp;
-       } else if (cal_retry > 0) {
        }
 
        wlc_phy_rx_iq_coeffs_nphy(pi, 1, &new_comp);