staging: rtl8192e: clean up brace coding style issues

Clean up brace coding style in if/else statements to improve
readability and clear checkpatch issues.

CHECK: braces {} should be used on all arms of this statement
CHECK: Unbalanced braces around else statement

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20230619150953.22484-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 7683853..e592589 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -765,8 +765,9 @@ void rtl92e_link_change(struct net_device *dev)
                                ;
                        else
                                priv->receive_config = reg |= RCR_CBSSID;
-               } else
+               } else {
                        priv->receive_config = reg &= ~RCR_CBSSID;
+               }
 
                rtl92e_writel(dev, RCR, reg);
        }

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 267fc6f..4d7d512 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -39,8 +39,9 @@ void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask,
                BitShift = _rtl92e_calculate_bit_shift(dwBitMask);
                NewValue = (OriginalValue & ~dwBitMask) | (dwData << BitShift);
                rtl92e_writel(dev, dwRegAddr, NewValue);
-       } else
+       } else {
                rtl92e_writel(dev, dwRegAddr, dwData);
+       }
 }
 
 u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask)
@@ -163,10 +164,10 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
 
                        _rtl92e_phy_rf_fw_write(dev, eRFPath, RegAddr,
                                                New_Value);
-               } else
+               } else {
                        _rtl92e_phy_rf_fw_write(dev, eRFPath, RegAddr, Data);
+               }
                udelay(200);
-
        } else {
                if (BitMask != bMask12Bits) {
                        Original_Value = _rtl92e_phy_rf_read(dev, eRFPath,
@@ -175,8 +176,9 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,
                        New_Value = (Original_Value & ~BitMask) | (Data << BitShift);
 
                        _rtl92e_phy_rf_write(dev, eRFPath, RegAddr, New_Value);
-               } else
+               } else {
                        _rtl92e_phy_rf_write(dev, eRFPath, RegAddr, Data);
+               }
        }
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index adb6f12..37c275c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -622,8 +622,9 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
                                } else if (priv->rtllib->current_network.channel != 14 && priv->bcck_in_ch14) {
                                        priv->bcck_in_ch14 = false;
                                        rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
-                               } else
+                               } else {
                                        rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
+                               }
                        }
 
                        if (priv->cck_present_attn_diff <= -12 ||

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index 5ecade8..1c49d5d 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
@@ -219,8 +219,9 @@ void rtl92e_leisure_ps_enter(struct net_device *dev)
 
                        if (priv->rtllib->ps == RTLLIB_PS_DISABLED)
                                _rtl92e_ps_set_mode(dev, RTLLIB_PS_MBCAST | RTLLIB_PS_UNICAST);
-               } else
+               } else {
                        psc->LpsIdleCount++;
+               }
        }
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 4436442..b680757 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -568,9 +568,9 @@ static int _rtl92e_wx_set_frag(struct net_device *dev,
        if (priv->hw_radio_off)
                return 0;
 
-       if (wrqu->frag.disabled)
+       if (wrqu->frag.disabled) {
                priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
-       else {
+       } else {
                if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
                    wrqu->frag.value > MAX_FRAG_THRESHOLD)
                        return -EINVAL;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 0eaff91..863e559 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -809,8 +809,9 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
                erpinfo_content = 0;
                if (ieee->current_network.buseprotection)
                        erpinfo_content |= ERP_UseProtection;
-       } else
+       } else {
                erp_len = 0;
+       }
 
        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
        encrypt = ieee->host_encrypt && crypt && crypt->ops &&
@@ -1383,9 +1384,9 @@ static void rtllib_associate_step1(struct rtllib_device *ieee, u8 *daddr)
 
        skb = rtllib_authentication_req(beacon, ieee, 0, daddr);
 
-       if (!skb)
+       if (!skb) {
                rtllib_associate_abort(ieee);
-       else {
+       } else {
                ieee->link_state = RTLLIB_ASSOCIATING_AUTHENTICATING;
                netdev_dbg(ieee->dev, "Sending authentication request\n");
                softmac_mgmt_xmit(skb, ieee);
@@ -1408,9 +1409,9 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge,
 
        skb = rtllib_authentication_req(beacon, ieee, chlen + 2, beacon->bssid);
 
-       if (!skb)
+       if (!skb) {
                rtllib_associate_abort(ieee);
-       else {
+       } else {
                c = skb_put(skb, chlen + 2);
                *(c++) = MFIE_TYPE_CHALLENGE;
                *(c++) = chlen;
@@ -1439,9 +1440,9 @@ static void rtllib_associate_step2(struct rtllib_device *ieee)
 
        ieee->softmac_stats.tx_ass_rq++;
        skb = rtllib_association_req(beacon, ieee);
-       if (!skb)
+       if (!skb) {
                rtllib_associate_abort(ieee);
-       else {
+       } else {
                softmac_mgmt_xmit(skb, ieee);
                mod_timer(&ieee->associate_timer, jiffies + (HZ / 2));
        }
@@ -1583,11 +1584,12 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
                                net->ssid_len = net->hidden_ssid_len;
                                ssidbroad = 1;
                        }
-               } else
+               } else {
                        ssidmatch =
                           (ieee->current_network.ssid_len == net->ssid_len) &&
                           (!strncmp(ieee->current_network.ssid, net->ssid,
                           net->ssid_len));
+               }
 
                /* if the user set the AP check if match.
                 * if the network does not broadcast essid we check the
@@ -2536,8 +2538,9 @@ static void rtllib_start_ibss_wq(void *data)
                        ieee->current_network.rates[3] =
                                 RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;
 
-               } else
+               } else {
                        ieee->current_network.rates_len = 0;
+               }
 
                if (ieee->modulation & RTLLIB_OFDM_MODULATION) {
                        ieee->current_network.rates_ex_len = 8;
@@ -3119,10 +3122,10 @@ void notify_wx_assoc_event(struct rtllib_device *ieee)
                return;
 
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-       if (ieee->link_state == MAC80211_LINKED)
+       if (ieee->link_state == MAC80211_LINKED) {
                memcpy(wrqu.ap_addr.sa_data, ieee->current_network.bssid,
                       ETH_ALEN);
-       else {
+       } else {
                netdev_info(ieee->dev, "%s(): Tell user space disconnected\n",
                            __func__);
                eth_zero_addr(wrqu.ap_addr.sa_data);

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index de3db87..2de63d1 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -231,9 +231,9 @@ int rtllib_wx_set_rts(struct rtllib_device *ieee,
                             struct iw_request_info *info,
                             union iwreq_data *wrqu, char *extra)
 {
-       if (wrqu->rts.disabled || !wrqu->rts.fixed)
+       if (wrqu->rts.disabled || !wrqu->rts.fixed) {
                ieee->rts = DEFAULT_RTS_THRESHOLD;
-       else {
+       } else {
                if (wrqu->rts.value < MIN_RTS_THRESHOLD ||
                                wrqu->rts.value > MAX_RTS_THRESHOLD)
                        return -EINVAL;