struct rtw_ieee80211_channel *ch, int ch_num)
 {
        u8 res = _FAIL;
-       struct cmd_obj          *ph2c;
-       struct sitesurvey_parm  *psurveyPara;
-       struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
+       struct cmd_obj *ph2c;
+       struct sitesurvey_parm *psurveyPara;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
        if (check_fwstate(pmlmepriv, _FW_LINKED))
 u8 rtw_createbss_cmd(struct adapter  *padapter)
 {
        struct cmd_obj *pcmd;
-       struct cmd_priv                         *pcmdpriv = &padapter->cmdpriv;
-       struct wlan_bssid_ex            *pdev_network = &padapter->registrypriv.dev_network;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+       struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;
        u8 res = _SUCCESS;
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
 {
        u8 res = _SUCCESS;
        uint    t_len = 0;
-       struct wlan_bssid_ex            *psecnetwork;
-       struct cmd_obj          *pcmd;
-       struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
-       struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
-       struct qos_priv         *pqospriv = &pmlmepriv->qospriv;
+       struct wlan_bssid_ex *psecnetwork;
+       struct cmd_obj *pcmd;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       struct qos_priv *pqospriv = &pmlmepriv->qospriv;
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
-       struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
+       struct ht_priv *phtpriv = &pmlmepriv->htpriv;
        enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.infrastructure_mode;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
        phtpriv->ht_option = false;
        ptmp = rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &tmp_len, pnetwork->network.ie_length-12);
        if (pregistrypriv->ht_enable && ptmp && tmp_len > 0) {
-               /*      Added by Albert 2010/06/23 */
-               /*      For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */
-               /*      Especially for Realtek 8192u SoftAP. */
+               /* Added by Albert 2010/06/23 */
+               /* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */
+               /* Especially for Realtek 8192u SoftAP. */
                if ((padapter->securitypriv.dot11PrivacyAlgrthm != _WEP40_) &&
                        (padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_) &&
                        (padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_)) {
 u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_key, bool enqueue)
 {
        struct cmd_obj *ph2c;
-       struct set_stakey_parm  *psetstakey_para;
-       struct cmd_priv                         *pcmdpriv = &padapter->cmdpriv;
-       struct set_stakey_rsp           *psetstakey_rsp = NULL;
-
-       struct mlme_priv                *pmlmepriv = &padapter->mlmepriv;
-       struct security_priv    *psecuritypriv = &padapter->securitypriv;
+       struct set_stakey_parm *psetstakey_para;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+       struct set_stakey_rsp *psetstakey_rsp = NULL;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       struct security_priv *psecuritypriv = &padapter->securitypriv;
        u8 res = _SUCCESS;
 
        psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
 u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueue)
 {
        struct cmd_obj *ph2c;
-       struct set_stakey_parm  *psetstakey_para;
-       struct cmd_priv                         *pcmdpriv = &padapter->cmdpriv;
-       struct set_stakey_rsp           *psetstakey_rsp = NULL;
+       struct set_stakey_parm *psetstakey_para;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
+       struct set_stakey_rsp *psetstakey_rsp = NULL;
        s16 cam_id = 0;
        u8 res = _SUCCESS;
 
 
 u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
 {
-       struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        struct cmd_obj *ph2c;
-       struct addBaReq_parm    *paddbareq_parm;
+       struct addBaReq_parm *paddbareq_parm;
 
        u8 res = _SUCCESS;
 
        u16 BusyThreshold = BusyThresholdHigh;
        u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
        u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
-
-       struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
        collect_traffic_statistics(padapter);
 
 u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
 {
        struct cmd_obj  *ph2c;
-       struct drvextra_cmd_parm        *pdrvextra_cmd_parm;
+       struct drvextra_cmd_parm *pdrvextra_cmd_parm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        /* struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); */
        u8 res = _SUCCESS;