staging: rtl8188eu: Fix coding style space related ERROR problems

This fixes space related ERROR reports by checkpatch.pl
Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \
  xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING
Already checked by text comparasion
$git diff -w
and binary comparasion of r8188eu.ko
$objdiff diff <old_commit> <new_commit>

Signed-off-by: Jia He <hejianet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index dd24138d13b15dbf266808a526ae1e4ef06d0503..a1cc788fe4b3dfd540d1ba1d3d67d370a7a0a832 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -637,7 +637,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
        ether_addr_copy(psetstakey_para->addr, sta->hwaddr);
 
        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-               psetstakey_para->algorithm = (unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
+               psetstakey_para->algorithm = (unsigned char)psecuritypriv->dot11PrivacyAlgrthm;
        else
                GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 755d3effd0a730bcb2cfcc29add5902cf0afca18..f2c3ca79c0c93026f142635028e6802d166e9976 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -159,7 +159,7 @@ u8 *rtw_set_ie
        return pbuf + len + 2;
 }
 
-inline u8 *rtw_set_ie_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode,
+inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode,
        u8 new_ch, u8 ch_switch_cnt)
 {
        u8 ie_data[3];
@@ -870,7 +870,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
        if (elen < 4) {
                if (show_errors) {
                        DBG_88E("short vendor specific information element ignored (len=%lu)\n",
-                               (unsigned long) elen);
+                               (unsigned long)elen);
                }
                return -1;
        }
@@ -890,7 +890,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
                case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
                        if (elen < 5) {
                                DBG_88E("short WME information element ignored (len=%lu)\n",
-                                       (unsigned long) elen);
+                                       (unsigned long)elen);
                                return -1;
                        }
                        switch (pos[4]) {
@@ -905,7 +905,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
                                break;
                        default:
                                DBG_88E("unknown WME information element ignored (subtype=%d len=%lu)\n",
-                                       pos[4], (unsigned long) elen);
+                                       pos[4], (unsigned long)elen);
                                return -1;
                        }
                        break;
@@ -916,7 +916,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
                        break;
                default:
                        DBG_88E("Unknown Microsoft information element ignored (type=%d len=%lu)\n",
-                               pos[3], (unsigned long) elen);
+                               pos[3], (unsigned long)elen);
                        return -1;
                }
                break;
@@ -929,13 +929,13 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
                        break;
                default:
                        DBG_88E("Unknown Broadcom information element ignored (type=%d len=%lu)\n",
-                               pos[3], (unsigned long) elen);
+                               pos[3], (unsigned long)elen);
                        return -1;
                }
                break;
        default:
                DBG_88E("unknown vendor specific information element ignored (vendor OUI %02x:%02x:%02x len=%lu)\n",
-                       pos[0], pos[1], pos[2], (unsigned long) elen);
+                       pos[0], pos[1], pos[2], (unsigned long)elen);
                return -1;
        }
        return 0;
@@ -969,7 +969,7 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len,
                if (elen > left) {
                        if (show_errors) {
                                DBG_88E("IEEE 802.11 element parse failed (id=%d elen=%d left=%lu)\n",
-                                       id, elen, (unsigned long) left);
+                                       id, elen, (unsigned long)left);
                        }
                        return ParseFailed;
                }

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index dec26a89c356498a9fc968aae735151d3dd1c5bb..d4632da50c1dd460306840576e99c299b6248be0 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -2115,7 +2115,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
                if (0 == issued) {
                        DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
                        psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
-                       rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra);
+                       rtw_addbareq_cmd(padapter, (u8)priority, pattrib->ra);
                }
        }
 }

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index a00ebcddc8818ffb6e351e133b9b2463cc0262a4..b0e92372fa5e50c853ac83b22052fc8b93613465 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -227,7 +227,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)
        pmlmeext->cur_channel = padapter->registrypriv.channel;
        pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20;
        pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
-       pmlmeext->oper_channel = pmlmeext->cur_channel ;
+       pmlmeext->oper_channel = pmlmeext->cur_channel;
        pmlmeext->oper_bwmode = pmlmeext->cur_bwmode;
        pmlmeext->oper_ch_offset = pmlmeext->cur_ch_offset;
        pmlmeext->retry = 0;
@@ -2000,7 +2000,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
                DBG_88E("%s, alloc mgnt frame fail\n", __func__);
                return;
        }
-#if defined (CONFIG_88EU_AP_MODE)
+#if defined(CONFIG_88EU_AP_MODE)
        spin_lock_bh(&pmlmepriv->bcn_update_lock);
 #endif /* if defined (CONFIG_88EU_AP_MODE) */
 
@@ -2027,7 +2027,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
        SetFrameSubType(pframe, WIFI_BEACON);
 
        pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
-       pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr);
+       pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
        if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
                int len_diff;
@@ -2042,8 +2042,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
                        );
                pframe += (cur_network->IELength+len_diff);
                pattrib->pktlen += (cur_network->IELength+len_diff);
-               wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof (struct rtw_ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
-                       pattrib->pktlen-sizeof (struct rtw_ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
+               wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct rtw_ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
+                       pattrib->pktlen-sizeof(struct rtw_ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
                if (wps_ie && wps_ielen > 0)
                        rtw_get_wps_attr_content(wps_ie,  wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);
                if (sr != 0)
@@ -2101,7 +2101,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
        /* todo:HT for adhoc */
 _issue_bcn:
 
-#if defined (CONFIG_88EU_AP_MODE)
+#if defined(CONFIG_88EU_AP_MODE)
        pmlmepriv->update_bcn = false;
 
        spin_unlock_bh(&pmlmepriv->bcn_update_lock);
@@ -2130,7 +2130,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
        __le16 *fctrl;
        unsigned char                                   *mac, *bssid;
        struct xmit_priv        *pxmitpriv = &(padapter->xmitpriv);
-#if defined (CONFIG_88EU_AP_MODE)
+#if defined(CONFIG_88EU_AP_MODE)
        u8 *pwps_ie;
        uint wps_ielen;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2323,8 +2323,8 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
        pmlmeext->mgnt_seq++;
        SetFrameSubType(pframe, WIFI_PROBEREQ);
 
-       pframe += sizeof (struct rtw_ieee80211_hdr_3addr);
-       pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr);
+       pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
+       pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
 
        if (pssid)
                pframe = rtw_set_ie(pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen));
@@ -3209,7 +3209,7 @@ exit:
        return ret;
 }
 
-void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
+void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
 {
        struct xmit_frame                       *pmgntframe;
        struct pkt_attrib                       *pattrib;
@@ -3260,7 +3260,7 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u
                pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
        }
 
-       pframe = rtw_set_ie_ch_switch (pframe, &(pattrib->pktlen), 0, new_ch, 0);
+       pframe = rtw_set_ie_ch_switch(pframe, &(pattrib->pktlen), 0, new_ch, 0);
        pframe = rtw_set_ie_secondary_ch_offset(pframe, &(pattrib->pktlen),
                hal_ch_offset_to_secondary_ch_offset(ch_offset));
 

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 53a054c189e4a76c3a999d270992a083a91040d2..a1619b88733fedc468af80e9c82521f60ad8d779 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -46,7 +46,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
 void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 {
 
-       memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv));
+       memset((u8 *)psta_recvpriv, 0, sizeof(struct sta_recv_priv));
 
        spin_lock_init(&psta_recvpriv->lock);
 
@@ -109,7 +109,7 @@ exit:
        return res;
 }
 
-void _rtw_free_recv_priv (struct recv_priv *precvpriv)
+void _rtw_free_recv_priv(struct recv_priv *precvpriv)
 {
        struct adapter  *padapter = precvpriv->adapter;
 
@@ -124,7 +124,7 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
 
 }
 
-struct recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
+struct recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue)
 {
        struct recv_frame *hdr;
        struct list_head *plist, *phead;
@@ -797,7 +797,7 @@ exit:
        return ret;
 }
 
-static int ap2sta_data_frame (
+static int ap2sta_data_frame(
        struct adapter *adapter,
        struct recv_frame *precv_frame,
        struct sta_info **psta)
@@ -1266,7 +1266,7 @@ static int validate_recv_frame(struct adapter *adapter,
        u8 bDumpRxPkt;
        struct rx_pkt_attrib *pattrib = &precv_frame->attrib;
        u8 *ptr = precv_frame->rx_data;
-       u8  ver = (unsigned char) (*ptr)&0x3;
+       u8  ver = (unsigned char)(*ptr)&0x3;
        struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
 
 
@@ -1981,7 +1981,7 @@ static int process_recv_indicatepkts(struct adapter *padapter,
                        }
                }
        } else { /* B/G mode */
-               retval = wlanhdr_to_ethhdr (prframe);
+               retval = wlanhdr_to_ethhdr(prframe);
                if (retval != _SUCCESS) {
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("wlanhdr_to_ethhdr: drop pkt\n"));
                        return retval;

diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index 1baa98e636e148574e4e74ee2b86120213849271..bd8d60a230e9b0fdad18e7c16cd9af17b02c5b5c 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -189,7 +189,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
                                arcfour_encrypt(&mycontext, payload+length, crc, 4);
 
                                pframe += pxmitpriv->frag_len;
-                               pframe = (u8 *) round_up((size_t)(pframe), 4);
+                               pframe = (u8 *)round_up((size_t)(pframe), 4);
                        }
                }
        }
@@ -258,7 +258,7 @@ static void secmicputuint32(u8 *p, u32 val)
 {
        long i;
        for (i = 0; i < 4; i++) {
-               *p++ = (u8) (val & 0xff);
+               *p++ = (u8)(val & 0xff);
                val >>= 8;
        }
 }
@@ -621,14 +621,14 @@ u32       rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
                                        arcfour_encrypt(&mycontext, payload, payload, length);
                                        arcfour_encrypt(&mycontext, payload+length, crc, 4);
                                } else {
-                                       length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ;
+                                       length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
                                        *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/
                                        arcfour_init(&mycontext, rc4key, 16);
                                        arcfour_encrypt(&mycontext, payload, payload, length);
                                        arcfour_encrypt(&mycontext, payload+length, crc, 4);
 
                                        pframe += pxmitpriv->frag_len;
-                                       pframe = (u8 *) round_up((size_t)(pframe), 4);
+                                       pframe = (u8 *)round_up((size_t)(pframe), 4);
                                }
                        }
                } else {
@@ -953,8 +953,8 @@ static void construct_mic_iv(u8 *mic_iv, int qc_exists, int a4_exists, u8 *mpdu,
                mic_iv[i] = mpdu[i + 8];        /* mic_iv[2:7] = A2[0:5] = mpdu[10:15] */
        for (i = 8; i < 14; i++)
                mic_iv[i] = pn_vector[13 - i];  /* mic_iv[8:13] = PN[5:0] */
-       mic_iv[14] = (unsigned char) (payload_length / 256);
-       mic_iv[15] = (unsigned char) (payload_length % 256);
+       mic_iv[14] = (unsigned char)(payload_length / 256);
+       mic_iv[15] = (unsigned char)(payload_length % 256);
 }
 
 /************************************************/
@@ -1045,8 +1045,8 @@ static void construct_ctr_preload(u8 *ctr_preload, int a4_exists, int qc_exists,
                ctr_preload[i] = mpdu[i + 8];                  /* ctr_preload[2:7] = A2[0:5] = mpdu[10:15] */
        for (i = 8; i < 14; i++)
                ctr_preload[i] =    pn_vector[13 - i];    /* ctr_preload[8:13] = PN[5:0] */
-       ctr_preload[14] =  (unsigned char) (c / 256); /* Ctr */
-       ctr_preload[15] =  (unsigned char) (c % 256);
+       ctr_preload[14] =  (unsigned char)(c / 256); /* Ctr */
+       ctr_preload[15] =  (unsigned char)(c % 256);
 }
 
 /************************************/
@@ -1238,11 +1238,11 @@ u32     rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
                                        aes_cipher(prwskey, pattrib->hdrlen, pframe, length);
                                } else{
-                                       length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len ;
+                                       length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
 
                                        aes_cipher(prwskey, pattrib->hdrlen, pframe, length);
                                        pframe += pxmitpriv->frag_len;
-                                       pframe = (u8 *) round_up((size_t)(pframe), 8);
+                                       pframe = (u8 *)round_up((size_t)(pframe), 8);
                                }
                        }
                } else{

diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index e1dc8fa82d38227d7b3d7d49cc9a235d773ec8be..dc9d0ddf6b3ae421c234e13ee497f717520350fc 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -29,7 +29,7 @@
 
 static void _rtw_init_stainfo(struct sta_info *psta)
 {
-       memset((u8 *)psta, 0, sizeof (struct sta_info));
+       memset((u8 *)psta, 0, sizeof(struct sta_info));
 
         spin_lock_init(&psta->lock);
        INIT_LIST_HEAD(&psta->list);

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index 639ace06a3d60a42252db7ff6d317636b66dee6d..a0bbf90933385c15f81e22c04037fca879516bbc 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -37,7 +37,7 @@ static void _init_txservq(struct tx_servq *ptxservq)
 
 void   _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
 {
-       memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv));
+       memset((unsigned char *)psta_xmitpriv, 0, sizeof(struct sta_xmit_priv));
        spin_lock_init(&psta_xmitpriv->lock);
        _init_txservq(&psta_xmitpriv->be_q);
        _init_txservq(&psta_xmitpriv->bk_q);
@@ -223,7 +223,7 @@ exit:
        return res;
 }
 
-void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
+void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
 {
        int i;
        struct adapter *padapter = pxmitpriv->adapter;
@@ -691,7 +691,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                        payload = pframe;
 
                        for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
-                               payload = (u8 *) round_up((size_t)(payload), 4);
+                               payload = (u8 *)round_up((size_t)(payload), 4);
                                RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
                                         ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",
                                         curfragnum, *payload, *(payload+1),
@@ -772,7 +772,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
        return _SUCCESS;
 }
 
-s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
+s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib)
 {
        u16 *qc;
 
@@ -1098,7 +1098,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 
                addr = (size_t)(pframe);
 
-               mem_start = (unsigned char *) round_up(addr, 4) + hw_hdr_offset;
+               mem_start = (unsigned char *)round_up(addr, 4) + hw_hdr_offset;
                memcpy(mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen);
        }
 

diff --git a/drivers/staging/rtl8188eu/hal/bb_cfg.c b/drivers/staging/rtl8188eu/hal/bb_cfg.c
index c2d166fa0a7f96aa7fbc6b1432acfbd1862d602e..1e963bf9e48bc928347ff156d7be1adbd960fbec 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/bb_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/bb_cfg.c
@@ -552,7 +552,7 @@ static void store_pwrindex_offset(struct adapter *Adapter, u32 regaddr, u32 bitm
        }
 }
 
-static void rtl_addr_delay(struct adapter *adapt, u32 addr, u32 bit_mask ,u32 data)
+static void rtl_addr_delay(struct adapter *adapt, u32 addr, u32 bit_mask, u32 data)
 {
        if (addr == 0xfe) {
                msleep(50);

diff --git a/drivers/staging/rtl8188eu/hal/fw.c b/drivers/staging/rtl8188eu/hal/fw.c
index 17b7f37505470a95097f79206a12728c2dec4ddd..3b2875481fc5bb7e6819e8fd0e5be105a72dba5b 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/fw.c
+++ b/drivers/staging/rtl8188eu/hal/fw.c
@@ -84,7 +84,7 @@ static void _rtl88e_fw_block_write(struct adapter *adapt,
 static void _rtl88e_fill_dummy(u8 *pfwbuf, u32 *pfwlen)
 {
        u32 fwlen = *pfwlen;
-       u8 remain = (u8) (fwlen % 4);
+       u8 remain = (u8)(fwlen % 4);
 
        remain = (remain == 0) ? 0 : (4 - remain);
 
@@ -101,7 +101,7 @@ static void _rtl88e_fw_page_write(struct adapter *adapt,
                                  u32 page, const u8 *buffer, u32 size)
 {
        u8 value8;
-       u8 u8page = (u8) (page & 0x07);
+       u8 u8page = (u8)(page & 0x07);
 
        value8 = (usb_read8(adapt, REG_MCUFWDL + 2) & 0xF8) | u8page;
 
@@ -193,13 +193,13 @@ int rtl88eu_download_fw(struct adapter *adapt)
        u32 fwsize;
        int err;
 
-       if (request_firmware(&fw, fw_name, device)){
+       if (request_firmware(&fw, fw_name, device)) {
                dev_err(device, "Firmware %s not available\n", fw_name);
                return -ENOENT;
        }
 
        if (fw->size > FW_8188E_SIZE) {
-               dev_err(device,"Firmware size exceed 0x%X. Check it.\n",
+               dev_err(device, "Firmware size exceed 0x%X. Check it.\n",
                         FW_8188E_SIZE);
                return -1;
        }

diff --git a/drivers/staging/rtl8188eu/hal/mac_cfg.c b/drivers/staging/rtl8188eu/hal/mac_cfg.c
index c0e7fa938059757d62dd72da9bbe01575f73f1c7..febc83a5adb874318b89383abce87b8681752828 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/mac_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/mac_cfg.c
@@ -127,7 +127,7 @@ bool rtl88eu_phy_mac_config(struct adapter *adapt)
        ptrarray = array_MAC_REG_8188E;
 
        for (i = 0; i < arraylength; i = i + 2)
-               usb_write8(adapt, ptrarray[i], (u8) ptrarray[i + 1]);
+               usb_write8(adapt, ptrarray[i], (u8)ptrarray[i + 1]);
 
        usb_write8(adapt, REG_MAX_AGGR_NUM, MAX_AGGR_NUM);
        return true;

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index e4df83710ca68fc1dd7efb028530b4527b2fa78c..9873998011d29057dff7e4eb49ba32080cb1172d 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -437,8 +437,8 @@ void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm)
 {
        struct adapter *adapter = pDM_Odm->Adapter;
 
-       pDM_Odm->bCckHighPower = (bool) phy_query_bb_reg(adapter, 0x824, BIT9);
-       pDM_Odm->RFPathRxEnable = (u8) phy_query_bb_reg(adapter, 0xc04, 0x0F);
+       pDM_Odm->bCckHighPower = (bool)phy_query_bb_reg(adapter, 0x824, BIT9);
+       pDM_Odm->RFPathRxEnable = (u8)phy_query_bb_reg(adapter, 0xc04, 0x0F);
 
        ODM_InitDebugSetting(pDM_Odm);
 }
@@ -529,7 +529,7 @@ void odm_DIGInit(struct odm_dm_struct *pDM_Odm)
        struct adapter *adapter = pDM_Odm->Adapter;
        struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
 
-       pDM_DigTable->CurIGValue = (u8) phy_query_bb_reg(adapter, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N);
+       pDM_DigTable->CurIGValue = (u8)phy_query_bb_reg(adapter, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N);
        pDM_DigTable->RssiLowThresh     = DM_DIG_THRESH_LOW;
        pDM_DigTable->RssiHighThresh    = DM_DIG_THRESH_HIGH;
        pDM_DigTable->FALowThresh       = DM_false_ALARM_THRESH_LOW;
@@ -620,7 +620,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)
                } else if (pDM_Odm->SupportAbility & ODM_BB_ANT_DIV) {
                        /* 1 Lower Bound for 88E AntDiv */
                        if (pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV) {
-                               DIG_Dynamic_MIN = (u8) pDM_DigTable->AntDiv_RSSI_max;
+                               DIG_Dynamic_MIN = (u8)pDM_DigTable->AntDiv_RSSI_max;
                                ODM_RT_TRACE(pDM_Odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,
                                             ("odm_DIG(): pDM_DigTable->AntDiv_RSSI_max=%d\n",
                                             pDM_DigTable->AntDiv_RSSI_max));

diff --git a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
index 4e4e21936e7ccf0c3d75cc3684b4815c197ef154..29f87dffbad374857a9ea755afc76e9b5f61abfb 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8188eu/hal/odm_HWConfig.c
@@ -118,7 +118,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
 
                cck_highpwr = dm_odm->bCckHighPower;
 
-               cck_agc_rpt =  pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a ;
+               cck_agc_rpt =  pPhyStaRpt->cck_agc_rpt_ofdm_cfosho_a;
 
                /* 2011.11.28 LukeLee: 88E use different LNA & VGA gain table */
                /* The RSSI formula should be modified according to the gain table */

diff --git a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
index 5342af778eb0b27275049edb3d6abba9b6f9b75b..d3c6873925bab8afe7cd6130556b2293cd7b890a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/rtl8188eu/hal/odm_RTL8188E.c
@@ -278,7 +278,7 @@ static void rtl88eu_dm_hw_ant_div(struct odm_dm_struct *dm_odm)
        struct rtw_dig *dig_table = &dm_odm->DM_DigTable;
        struct sta_info *entry;
        u32 i, min_rssi = 0xFF, ant_div_max_rssi = 0, max_rssi = 0;
-       u32 local_min_rssi,local_max_rssi;
+       u32 local_min_rssi, local_max_rssi;
        u32 main_rssi, aux_rssi;
        u8 RxIdleAnt = 0, target_ant = 7;
 

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index c4f7f358a81c16ee271c6b855770049d545c8270..3f663fe151ba9125c7e1c8754c8ce4d139d42870 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -478,7 +478,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
                /* 2.4G, decrease power */
                {0, 0, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11},
                /* 2.4G, increase power */
-               {0, 0, -1, -2, -3, -4,-4, -4, -4, -5, -7, -8,-9, -9, -10},
+               {0, 0, -1, -2, -3, -4, -4, -4, -4, -5, -7, -8, -9, -9, -10},
        };
        u8 thermal_mapping[2][index_mapping_NUM_88E] = {
                /* 2.4G, decrease power */

diff --git a/drivers/staging/rtl8188eu/hal/rf.c b/drivers/staging/rtl8188eu/hal/rf.c
index c2fac34c81329e9e6af769e0f35d91ae7c59ea6b..eea4c8a6022b6643d6164a09102ceb6ed07bc8d1 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rf.c
+++ b/drivers/staging/rtl8188eu/hal/rf.c
@@ -131,7 +131,7 @@ void rtl88eu_phy_rf6052_set_cck_txpower(struct adapter *adapt, u8 *powerlevel)
 /*  powerbase1 for HT MCS rates */
 static void getpowerbase88e(struct adapter *adapt, u8 *pwr_level_ofdm,
                            u8 *pwr_level_bw20, u8 *pwr_level_bw40,
-                           u8 channel,u32 *ofdmbase, u32 *mcs_base)
+                           u8 channel, u32 *ofdmbase, u32 *mcs_base)
 {
        struct hal_data_8188e *hal_data = GET_HAL_DATA(adapt);
        u32 powerbase0, powerbase1;

diff --git a/drivers/staging/rtl8188eu/hal/rf_cfg.c b/drivers/staging/rtl8188eu/hal/rf_cfg.c
index ddc2f55fe13f4690d41c42ab8edd82a5aadd59a9..5dc11cae2ef992e6e541161ac67423ba9bc629e5 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rf_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/rf_cfg.c
@@ -164,7 +164,7 @@ do {                                                                \
 #define B3WIREDATALENGTH 0x800
 #define BRFSI_RFENV 0x10
 
-static void rtl_rfreg_delay(struct adapter *adapt, enum rf_radio_path rfpath,u32 addr, u32 mask, u32 data)
+static void rtl_rfreg_delay(struct adapter *adapt, enum rf_radio_path rfpath, u32 addr, u32 mask, u32 data)
 {
        if (addr == 0xfe) {
                mdelay(50);
@@ -190,7 +190,7 @@ static void rtl8188e_config_rf_reg(struct adapter *adapt,
        u32 content = 0x1000; /*RF Content: radio_a_txt*/
        u32 maskforphyset = (u32)(content & 0xE000);
 
-       rtl_rfreg_delay(adapt, RF90_PATH_A, addr| maskforphyset,
+       rtl_rfreg_delay(adapt, RF90_PATH_A, addr | maskforphyset,
                        RFREG_OFFSET_MASK,
                        data);
 }

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
index ce55d9d9f0f633a7e1685f650fdbd97a018fe001..7f30dea1b53ba2663895576b0755320400660e6b 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
@@ -252,7 +252,7 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *adapt, __le16 mstatus_rpt)
 {
        u8 opmode, macid;
        u16 mst_rpt = le16_to_cpu(mstatus_rpt);
-       opmode = (u8) mst_rpt;
+       opmode = (u8)mst_rpt;
        macid = (u8)(mst_rpt >> 8);
 
        DBG_88E("### %s: MStatus=%x MACID=%d\n", __func__, opmode, macid);

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
index be9eede6931df25acc2c38521ec1f9bc517eae09..594c1da9db23d6d498456828ac0242fd18db4c1a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c
@@ -399,7 +399,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe)
 
                mem_addr += w_sz;
 
-               mem_addr = (u8 *) round_up((size_t)mem_addr, 4);
+               mem_addr = (u8 *)round_up((size_t)mem_addr, 4);
        }
 
        rtw_free_xmitframe(pxmitpriv, pxmitframe);

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index ac6abac58bfebeabef4695b904747589fff7836a..14650e91c78a55f4765e520a9c3c58b9275b4a4c 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -2012,7 +2012,7 @@ static u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eV
                        u8 bRSSIDump = *((u8 *)pValue);
                        struct odm_dm_struct *dm_ocm = &(haldata->odmpriv);
                        if (bRSSIDump)
-                               dm_ocm->DebugComponents =       ODM_COMP_DIG|ODM_COMP_FA_CNT    ;
+                               dm_ocm->DebugComponents =       ODM_COMP_DIG|ODM_COMP_FA_CNT;
                        else
                                dm_ocm->DebugComponents = 0;
                }

diff --git a/drivers/staging/rtl8188eu/include/ieee80211_ext.h b/drivers/staging/rtl8188eu/include/ieee80211_ext.h
index 1052d1817a97223cc33f521055f4a89f50d4814e..15e53d380ad00a45eeac2175e736079b8636d0b8 100644 (file)
--- a/drivers/staging/rtl8188eu/include/ieee80211_ext.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211_ext.h
@@ -103,24 +103,24 @@ struct wme_parameter_element {
 
 #define WPA_PUT_LE16(a, val)                   \
        do {                                    \
-               (a)[1] = ((u16) (val)) >> 8;    \
-               (a)[0] = ((u16) (val)) & 0xff;  \
+               (a)[1] = ((u16)(val)) >> 8;     \
+               (a)[0] = ((u16)(val)) & 0xff;   \
        } while (0)
 
 #define WPA_PUT_BE32(a, val)                                   \
        do {                                                    \
-               (a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff);   \
-               (a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff);   \
-               (a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff);    \
-               (a)[3] = (u8) (((u32) (val)) & 0xff);           \
+               (a)[0] = (u8)((((u32) (val)) >> 24) & 0xff);    \
+               (a)[1] = (u8)((((u32) (val)) >> 16) & 0xff);    \
+               (a)[2] = (u8)((((u32) (val)) >> 8) & 0xff);     \
+               (a)[3] = (u8)(((u32) (val)) & 0xff);            \
        } while (0)
 
 #define WPA_PUT_LE32(a, val)                                   \
        do {                                                    \
-               (a)[3] = (u8) ((((u32) (val)) >> 24) & 0xff);   \
-               (a)[2] = (u8) ((((u32) (val)) >> 16) & 0xff);   \
-               (a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff);    \
-               (a)[0] = (u8) (((u32) (val)) & 0xff);           \
+               (a)[3] = (u8)((((u32) (val)) >> 24) & 0xff);    \
+               (a)[2] = (u8)((((u32) (val)) >> 16) & 0xff);    \
+               (a)[1] = (u8)((((u32) (val)) >> 8) & 0xff);     \
+               (a)[0] = (u8)(((u32) (val)) & 0xff);            \
        } while (0)
 
 #define RSN_SELECTOR_PUT(a, val) WPA_PUT_BE32((u8 *)(a), (val))

diff --git a/drivers/staging/rtl8188eu/include/osdep_service.h b/drivers/staging/rtl8188eu/include/osdep_service.h
index fed9c86890b4b21075156335fdff4e537e764566..82f58f87656a6bd54196da0e2afd00ff5f8434ee 100644 (file)
--- a/drivers/staging/rtl8188eu/include/osdep_service.h
+++ b/drivers/staging/rtl8188eu/include/osdep_service.h
@@ -182,8 +182,8 @@ u64 rtw_modular64(u64 x, u64 y);
 
 /* Macros for handling unaligned memory accesses */
 
-#define RTW_GET_BE24(a) ((((u32) (a)[0]) << 16) | (((u32) (a)[1]) << 8) | \
-                        ((u32) (a)[2]))
+#define RTW_GET_BE24(a) ((((u32)(a)[0]) << 16) | (((u32) (a)[1]) << 8) | \
+                        ((u32)(a)[2]))
 
 void rtw_buf_free(u8 **buf, u32 *buf_len);
 void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len);

diff --git a/drivers/staging/rtl8188eu/include/rtw_debug.h b/drivers/staging/rtl8188eu/include/rtw_debug.h
index a38616e3cad2825bcc044992857792b17fc2df0b..971bf457f32d1149cb3f5ccc6c4277cb8072e46d 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_debug.h
+++ b/drivers/staging/rtl8188eu/include/rtw_debug.h
@@ -106,7 +106,7 @@ extern u32 GlobalDebugLevel;
                        u8      *ptr = (u8 *)_hexdata;                  \
                        pr_info("%s", DRIVER_PREFIX);                   \
                        pr_info(_titlestring);                          \
-                       for (__i = 0; __i < (int)_hexdatalen; __i++ ) { \
+                       for (__i = 0; __i < (int)_hexdatalen; __i++) {  \
                                pr_info("%02X%s", ptr[__i],             \
                                         (((__i + 1) % 4) == 0) ?       \
                                         "  " : " ");   \

diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index c5194b620da4919b6c7c1e01c1180049201885aa..dec8dbc483b438fd2437791326ee238540edee95 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -92,7 +92,7 @@ struct LED_871x {
 
 void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE      LedAction);
 
-struct led_priv{
+struct led_priv {
        /* add for led control */
        struct LED_871x                 SwLed0;
        u8      bRegUseLed;

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index d699ca19ef1627c4cec627022223916ea7a33f23..8d72ccf5f2a0da7b8473543c46cabe398a5df344 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -448,7 +448,7 @@ struct mlme_ext_priv {
 
 int init_mlme_ext_priv(struct adapter *adapter);
 int init_hw_mlme_ext(struct adapter *padapter);
-void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);
+void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext);
 extern void init_mlme_ext_timer(struct adapter *padapter);
 extern void init_addba_retry_timer(struct adapter *adapt, struct sta_info *sta);
 extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);
@@ -646,8 +646,8 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter,
 
 void linked_status_chk(struct adapter *padapter);
 
-void survey_timer_hdl (void *function_context);
-void link_timer_hdl (void *funtion_context);
+void survey_timer_hdl(void *function_context);
+void link_timer_hdl(void *funtion_context);
 void addba_timer_hdl(void *function_context);
 
 #define set_survey_timer(mlmeext, ms) \
@@ -708,15 +708,15 @@ u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf);
 #ifdef _RTW_CMD_C_
 
 static struct cmd_hdl wlancmds[] = {
-       GEN_MLME_EXT_HANDLER(sizeof (struct wlan_bssid_ex), join_cmd_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct disconnect_parm), disconnect_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct wlan_bssid_ex), createbss_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct setopmode_parm), setopmode_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct sitesurvey_parm), sitesurvey_cmd_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct setauth_parm), setauth_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct setkey_parm), setkey_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct set_stakey_parm), set_stakey_hdl)
-       GEN_MLME_EXT_HANDLER(sizeof (struct set_assocsta_parm), NULL)
+       GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), join_cmd_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct disconnect_parm), disconnect_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), createbss_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct setopmode_parm), setopmode_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct sitesurvey_parm), sitesurvey_cmd_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct setauth_parm), setauth_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct setkey_parm), setkey_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct set_stakey_parm), set_stakey_hdl)
+       GEN_MLME_EXT_HANDLER(sizeof(struct set_assocsta_parm), NULL)
        GEN_MLME_EXT_HANDLER(sizeof(struct addBaReq_parm), add_ba_hdl)
        GEN_MLME_EXT_HANDLER(sizeof(struct set_ch_parm), set_ch_hdl)
        GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex), tx_beacon_hdl)
@@ -787,7 +787,7 @@ static struct fwevent wlanevents[] = {
        {0, NULL},
        {0, NULL},
        {0, &rtw_survey_event_callback},                /*8*/
-       {sizeof (struct surveydone_event), &rtw_surveydone_event_callback},/*9*/
+       {sizeof(struct surveydone_event), &rtw_surveydone_event_callback},/*9*/
        {0, &rtw_joinbss_event_callback},               /*10*/
        {sizeof(struct stassoc_event), &rtw_stassoc_event_callback},
        {sizeof(struct stadel_event), &rtw_stadel_event_callback},

diff --git a/drivers/staging/rtl8188eu/include/wifi.h b/drivers/staging/rtl8188eu/include/wifi.h
index a88ebf41bba11c5746793f7d011137e486956a83..8dbdfafd52b55e3a86db5632c00511d9891a1a34 100644 (file)
--- a/drivers/staging/rtl8188eu/include/wifi.h
+++ b/drivers/staging/rtl8188eu/include/wifi.h
@@ -766,27 +766,27 @@ enum ht_cap_ampdu_factor {
 #define OP_MODE_20MHZ_HT_STA_ASSOCED    2
 #define OP_MODE_MIXED                   3
 
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK       ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE          ((u8) BIT(0))
-#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW          ((u8) BIT(0) | BIT(1))
-#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH          ((u8) BIT(2))
-#define HT_INFO_HT_PARAM_RIFS_MODE                     ((u8) BIT(3))
-#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY              ((u8) BIT(4))
-#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY      ((u8) BIT(5))
+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK       ((u8)BIT(0) | BIT(1))
+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE          ((u8)BIT(0))
+#define HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW          ((u8)BIT(0) | BIT(1))
+#define HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH          ((u8)BIT(2))
+#define HT_INFO_HT_PARAM_RIFS_MODE                     ((u8)BIT(3))
+#define HT_INFO_HT_PARAM_CTRL_ACCESS_ONLY              ((u8)BIT(4))
+#define HT_INFO_HT_PARAM_SRV_INTERVAL_GRANULARITY      ((u8)BIT(5))
 
 #define HT_INFO_OPERATION_MODE_OP_MODE_MASK    \
-               ((u16) (0x0001 | 0x0002))
+               ((u16)(0x0001 | 0x0002))
 #define HT_INFO_OPERATION_MODE_OP_MODE_OFFSET          0
-#define HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT     ((u8) BIT(2))
-#define HT_INFO_OPERATION_MODE_TRANSMIT_BURST_LIMIT    ((u8) BIT(3))
-#define HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT      ((u8) BIT(4))
-
-#define HT_INFO_STBC_PARAM_DUAL_BEACON         ((u16) BIT(6))
-#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT   ((u16) BIT(7))
-#define HT_INFO_STBC_PARAM_SECONDARY_BC                ((u16) BIT(8))
-#define HT_INFO_STBC_PARAM_LSIG_TXOP_PROTECT_ALLOWED   ((u16) BIT(9))
-#define HT_INFO_STBC_PARAM_PCO_ACTIVE          ((u16) BIT(10))
-#define HT_INFO_STBC_PARAM_PCO_PHASE           ((u16) BIT(11))
+#define HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT     ((u8)BIT(2))
+#define HT_INFO_OPERATION_MODE_TRANSMIT_BURST_LIMIT    ((u8)BIT(3))
+#define HT_INFO_OPERATION_MODE_NON_HT_STA_PRESENT      ((u8)BIT(4))
+
+#define HT_INFO_STBC_PARAM_DUAL_BEACON         ((u16)BIT(6))
+#define HT_INFO_STBC_PARAM_DUAL_STBC_PROTECT   ((u16)BIT(7))
+#define HT_INFO_STBC_PARAM_SECONDARY_BC                ((u16)BIT(8))
+#define HT_INFO_STBC_PARAM_LSIG_TXOP_PROTECT_ALLOWED   ((u16)BIT(9))
+#define HT_INFO_STBC_PARAM_PCO_ACTIVE          ((u16)BIT(10))
+#define HT_INFO_STBC_PARAM_PCO_PHASE           ((u16)BIT(11))
 
 /*     ===============WPS Section=============== */
 /*     For WPSv1.0 */

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 08ba7d3e6c69bfcd7a37b699be756cb0570b9e9a..f34fb29ae225149189d08d67d857988932abbb9a 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -361,7 +361,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
        param->u.crypt.err = 0;
        param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
 
-       if (param_len < (u32) ((u8 *)param->u.crypt.key - (u8 *)param) + param->u.crypt.key_len) {
+       if (param_len < (u32)((u8 *)param->u.crypt.key - (u8 *)param) + param->u.crypt.key_len) {
                ret =  -EINVAL;
                goto exit;
        }

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 08a80f759b8d580a94a155e359460347047a36b8..0b488d29bd37a5b3f2c8e4489c78ee4e92fb44f9 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -527,7 +527,7 @@ static uint loadparam(struct adapter *padapter,  struct  net_device *pnetdev)
 
        registry_par->channel = (u8)rtw_channel;
        registry_par->wireless_mode = (u8)rtw_wireless_mode;
-       registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
+       registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense;
        registry_par->vcs_type = (u8)rtw_vcs_type;
        registry_par->rts_thresh = (u16)rtw_rts_thresh;
        registry_par->frag_thresh = (u16)rtw_frag_thresh;

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 7da85f9c127b1fa4c73d546c0ba9ee65e2623561..d2efa9dfc8c062300a567e30e14d365d20575aba 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -160,10 +160,10 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
                switch (haldata->UsbRxAggMode) {
                case USB_RX_AGG_DMA:
                case USB_RX_AGG_MIX:
-                       pkt_offset = (u16) round_up(pkt_offset, 128);
+                       pkt_offset = (u16)round_up(pkt_offset, 128);
                        break;
                case USB_RX_AGG_USB:
-                       pkt_offset = (u16) round_up(pkt_offset, 4);
+                       pkt_offset = (u16)round_up(pkt_offset, 4);
                        break;
                case USB_RX_AGG_DISABLE:
                default:

diff --git a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
index 0ce47b07ef8605b1f61ee7ba31fb4d02226a48d6..d5e41a52a0eb4b563c4f08d482e51b0d60326f42 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/xmit_linux.c
@@ -46,7 +46,7 @@ void _rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile)
 
 }
 
-uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen)
+uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)
 {
        uint    len = 0;