staging: rtl8188eu: cleanup inconsistent indenting

Cleanup all inconsistent indenting reported by smatch.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 4988d97..cb6d1fb 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -37,7 +37,7 @@ void efuse_power_switch(struct adapter *pAdapter, u8 write, u8 pwrstate)
                tmpv16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
                if (!(tmpv16 & PWC_EV12V)) {
                        tmpv16 |= PWC_EV12V;
-                        usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
+                       usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
                }
                /*  Reset: 0x0000h[28], default valid */
                tmpv16 =  usb_read16(pAdapter, REG_SYS_FUNC_EN);

diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 20f34d2..5c4ff81 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -246,7 +246,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
                wireless_mode = pregistrypriv->wireless_mode;
        }
 
-               rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
+       rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
 
        rateLen = rtw_get_rateset_len(pdev_network->SupportedRates);
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 98106e7..a2e7789 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -357,7 +357,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                }
                if (pLed->bLedLinkBlinkInProgress) {
                        del_timer_sync(&pLed->BlinkTimer);
-                        pLed->bLedLinkBlinkInProgress = false;
+                       pLed->bLedLinkBlinkInProgress = false;
                }
                if (pLed->bLedBlinkInProgress) {
                        del_timer_sync(&pLed->BlinkTimer);
@@ -383,7 +383,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
                }
                if (pLed->bLedLinkBlinkInProgress) {
                        del_timer_sync(&pLed->BlinkTimer);
-                        pLed->bLedLinkBlinkInProgress = false;
+                       pLed->bLedLinkBlinkInProgress = false;
                }
                if (pLed->bLedBlinkInProgress) {
                        del_timer_sync(&pLed->BlinkTimer);

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index d18d343..858b597 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -305,7 +305,7 @@ static int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
 
 int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
 {
-        u16 s_cap, d_cap;
+       u16 s_cap, d_cap;
        __le16 le_scap, le_dcap;
 
        memcpy((u8 *)&le_scap, rtw_get_capability_from_ie(src->ies), 2);
@@ -842,7 +842,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
        if (psta) { /* update ptarget_sta */
                DBG_88E("%s\n", __func__);
                psta->aid  = pnetwork->join_res;
-                       psta->mac_id = 0;
+               psta->mac_id = 0;
                /* sta mode */
                rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
                /* security related */
@@ -1038,12 +1038,12 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
                        }
 
                        /* s4. indicate connect */
-                               if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
-                                       rtw_indicate_connect(adapter);
-                               } else {
-                                       /* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */
-                                       RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("adhoc mode, fw_state:%x", get_fwstate(pmlmepriv)));
-                               }
+                       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
+                               rtw_indicate_connect(adapter);
+                       } else {
+                               /* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */
+                               RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("adhoc mode, fw_state:%x", get_fwstate(pmlmepriv)));
+                       }
 
                        /* s5. Cancel assoc_timer */
                        del_timer_sync(&pmlmepriv->assoc_timer);

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index f3eb63f..380d544 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -488,7 +488,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,
                prtnframe = precv_frame;
        }
 
-               return prtnframe;
+       return prtnframe;
 }
 
 static int recv_decache(struct recv_frame *precv_frame, u8 bretry,

diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index a2ec0e4..f740763 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -353,7 +353,7 @@ void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_cod
 
        /* Michael MIC pseudo header: DA, SA, 3 x 0, Priority */
        if (header[1]&1) {   /* ToDS == 1 */
-                       rtw_secmicappend(&micdata, &header[16], 6);  /* DA */
+               rtw_secmicappend(&micdata, &header[16], 6);  /* DA */
                if (header[1]&2)  /* From Ds == 1 */
                        rtw_secmicappend(&micdata, &header[24], 6);
                else
@@ -1273,8 +1273,7 @@ u32       rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
                }
        }
 
-
-               return res;
+       return res;
 }
 
 u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)

diff --git a/drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c b/drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c
index 464c117..6dbd7d2 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c
+++ b/drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c
@@ -418,14 +418,16 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf
        } else {
                pRaInfo->LowestRate = 0;
        }
-               if (pRaInfo->HighestRate > 0x13)
-                       pRaInfo->PTModeSS = 3;
-               else if (pRaInfo->HighestRate > 0x0b)
-                       pRaInfo->PTModeSS = 2;
-               else if (pRaInfo->HighestRate > 0x0b)
-                       pRaInfo->PTModeSS = 1;
-               else
-                       pRaInfo->PTModeSS = 0;
+
+       if (pRaInfo->HighestRate > 0x13)
+               pRaInfo->PTModeSS = 3;
+       else if (pRaInfo->HighestRate > 0x0b)
+               pRaInfo->PTModeSS = 2;
+       else if (pRaInfo->HighestRate > 0x0b)
+               pRaInfo->PTModeSS = 1;
+       else
+               pRaInfo->PTModeSS = 0;
+
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
                     ("ODM_ARFBRefresh_8188E(): PTModeSS =%d\n", pRaInfo->PTModeSS));
 

diff --git a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index 0464dc4..9d63afd 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -185,7 +185,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
 
                /*  (1)Get RSSI for HT rate */
 
-                for (i = RF_PATH_A; i < RF_PATH_MAX; i++) {
+               for (i = RF_PATH_A; i < RF_PATH_MAX; i++) {
                        /*  2008/01/30 MH we will judge RF RX path now. */
                        if (dm_odm->RFPathRxEnable & BIT(i))
                                rf_rx_num++;

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 12864b6..75a28bf 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -785,13 +785,13 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
        haldata->RfRegChnlVal[0] = rtw_hal_read_rfreg(Adapter, (enum rf_radio_path)0, RF_CHNLBW, bRFRegOffsetMask);
        haldata->RfRegChnlVal[1] = rtw_hal_read_rfreg(Adapter, (enum rf_radio_path)1, RF_CHNLBW, bRFRegOffsetMask);
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK);
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_TURN_ON_BLOCK);
        _BBTurnOnBlock(Adapter);
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_SECURITY);
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_SECURITY);
        invalidate_cam_all(Adapter);
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC11);
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC11);
        /*  2010/12/17 MH We need to set TX power according to EFUSE content at first. */
        phy_set_tx_power_level(Adapter, haldata->CurrentChannel);
 
@@ -816,7 +816,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC11);
        /* Nav limit , suggest by scott */
        usb_write8(Adapter, 0x652, 0x0);
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);
        rtl8188e_InitHalDm(Adapter);
 
        /*  2010/08/11 MH Merge from 8192SE for Minicard init. We need to confirm current radio status */
@@ -840,8 +840,8 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);
        /* enable tx DMA to drop the redundate data of packet */
        usb_write16(Adapter, REG_TXDMA_OFFSET_CHK, (usb_read16(Adapter, REG_TXDMA_OFFSET_CHK) | DROP_DATA_EN));
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_IQK);
-               /*  2010/08/26 MH Merge from 8192CE. */
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_IQK);
+       /*  2010/08/26 MH Merge from 8192CE. */
        if (pwrctrlpriv->rf_pwrstate == rf_on) {
                if (haldata->odmpriv.RFCalibrateInfo.bIQKInitialized) {
                        rtl88eu_phy_iq_calibrate(Adapter, true);
@@ -850,12 +850,12 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_IQK);
                        haldata->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
                }
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK);
+               HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_PW_TRACK);
 
                ODM_TXPowerTrackingCheck(&haldata->odmpriv);
 
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
-                       rtl88eu_phy_lc_calibrate(Adapter);
+               HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
+               rtl88eu_phy_lc_calibrate(Adapter);
        }
 
 /* HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_PABIAS); */
@@ -866,7 +866,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
        usb_write32(Adapter, REG_FWHW_TXQ_CTRL, usb_read32(Adapter, REG_FWHW_TXQ_CTRL) | BIT(12));
 
 exit:
-HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
+       HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
 
        DBG_88E("%s in %dms\n", __func__,
                jiffies_to_msecs(jiffies - init_start_time));

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 4801345..408fabf 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -421,7 +421,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                                ret = -EOPNOTSUPP;
                                goto exit;
                        }
-                     memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
+                       memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
                        psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
                        rtw_set_key(padapter, psecuritypriv, wep_key_idx, 0);
                }
@@ -1317,8 +1317,8 @@ static int rtw_wx_set_essid(struct net_device *dev,
 
                RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("rtw_wx_set_essid: ssid =[%s]\n", src_ssid));
                spin_lock_bh(&queue->lock);
-              phead = get_list_head(queue);
-             pmlmepriv->pscanned = phead->next;
+               phead = get_list_head(queue);
+               pmlmepriv->pscanned = phead->next;
 
                while (phead != pmlmepriv->pscanned) {
                        pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);
@@ -1400,7 +1400,7 @@ static int rtw_wx_set_rate(struct net_device *dev,
        u32     target_rate = wrqu->bitrate.value;
        u32     fixed = wrqu->bitrate.fixed;
        u32     ratevalue = 0;
-        u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
+       u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_set_rate\n"));
        RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_, ("target_rate = %d, fixed = %d\n", target_rate, fixed));
@@ -2278,7 +2278,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                        /* don't update "psecuritypriv->dot11PrivacyAlgrthm" and */
                        /* psecuritypriv->dot11PrivacyKeyIndex = keyid", but can rtw_set_key to cam */
 
-                     memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
+                       memcpy(&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0]), pwep->KeyMaterial, pwep->KeyLength);
 
                        psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
 

diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index 238c1d9..d5ceb3b 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -78,7 +78,7 @@ void rtw_os_indicate_disconnect(struct adapter *adapter)
 {
        netif_carrier_off(adapter->pnetdev); /*  Do it first for tx broadcast pkt after disconnection issue! */
        rtw_indicate_wx_disassoc_event(adapter);
-        rtw_reset_securitypriv(adapter);
+       rtw_reset_securitypriv(adapter);
 }
 
 void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie)

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 0a9877d..dac9f98 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -643,7 +643,7 @@ int  ips_netdrv_open(struct adapter *padapter)
        mod_timer(&padapter->mlmepriv.dynamic_chk_timer,
                  jiffies + msecs_to_jiffies(5000));
 
-        return _SUCCESS;
+       return _SUCCESS;
 
 netdev_open_error:
        DBG_88E("-ips_netdrv_open - drv_open failure, bup =%d\n", padapter->bup);