Staging: rtl8712: fix spaces before semicolons

Resolve all of the 'WARNING: space prohibited before semicolon'
checkpatch warnings for rtl8712.

Signed-off-by: Thomas Cort <linuxgeek@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 6e81ba0eaf1e5542346c7a04121333d4193aedc4..82a77b45fb50901df1bfb0aba005da9375313517 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -141,7 +141,7 @@ static uint loadparam(struct _adapter *padapter, struct  net_device *pnetdev)
        registry_par->ssid.SsidLength = 3;
        registry_par->channel = (u8)channel;
        registry_par->wireless_mode = (u8)wireless_mode;
-       registry_par->vrtl_carrier_sense = (u8)vrtl_carrier_sense ;
+       registry_par->vrtl_carrier_sense = (u8)vrtl_carrier_sense;
        registry_par->vcs_type = (u8)vcs_type;
        registry_par->frag_thresh = (u16)frag_thresh;
        registry_par->preamble = (u8)preamble;

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 53f247b324e019176d2a9a7a5d48b3f455c53a63..5b6a96e3bd7b15db5f8c2a34fc9dc592a61fd2cd 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -62,7 +62,7 @@ static void check_hw_pbc(struct _adapter *padapter)
        r8712_write8(padapter, GPIO_IO_SEL, tmp1byte);
        tmp1byte = r8712_read8(padapter, GPIO_CTRL);
        if (tmp1byte == 0xff)
-               return ;
+               return;
        if (tmp1byte&HAL_8192S_HW_GPIO_WPS_BIT) {
                /* Here we only set bPbcPressed to true
                 * After trigger PBC, the variable will be set to false */
@@ -381,7 +381,7 @@ _next:
                        *pcmdbuf = cpu_to_le32((cmdsz & 0x0000ffff) |
                                               (pcmd->cmdcode << 16) |
                                               (pcmdpriv->cmd_seq << 24));
-                       pcmdbuf += 2 ; /* 8 bytes alignment */
+                       pcmdbuf += 2; /* 8 bytes alignment */
                        memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
                        while (check_cmd_fifo(padapter, wr_sz) == _FAIL) {
                                if ((padapter->bDriverStopped == true) ||

diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c
index 377fca905801aa974749ac9943d13efee51d5bec..c9eeb4270ab9d84e4a8619d8f4d9270bfe9ba085 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_efuse.c
+++ b/drivers/staging/rtl8712/rtl8712_efuse.c
@@ -231,7 +231,7 @@ u16 r8712_efuse_get_current_size(struct _adapter *padapter)
                        /* read next header */
                        efuse_addr = efuse_addr + (word_cnts * 2) + 1;
                } else
-                       bContinual = false ;
+                       bContinual = false;
        }
        return efuse_addr;
 }

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index d59a74aa30489f2bf70c9f6b8a450d8ddaf4b484..ea965370d1ac9ed0bc5520721532b8d15419adfd 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -108,7 +108,7 @@ void r8712_free_recv_priv(struct recv_priv *precvpriv)
        struct _adapter *padapter = precvpriv->adapter;
 
        precvbuf = (struct recv_buf *)precvpriv->precv_buf;
-       for (i = 0; i < NR_RECVBUFF ; i++) {
+       for (i = 0; i < NR_RECVBUFF; i++) {
                r8712_os_recvbuf_resource_free(padapter, precvbuf);
                precvbuf++;
        }
@@ -268,7 +268,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,
        u8   *psta_addr;
        struct recv_frame_hdr *pfhdr;
        struct sta_info *psta;
-       struct  sta_priv *pstapriv ;
+       struct  sta_priv *pstapriv;
        struct list_head *phead;
        union recv_frame *prtnframe = NULL;
        struct  __queue *pfree_recv_queue, *pdefrag_q;
@@ -849,7 +849,7 @@ static void query_rx_phy_status(struct _adapter *padapter,
        } else {
                /* (1)Get RSSI for HT rate */
                for (i = 0; i < ((padapter->registrypriv.rf_config) &
-                           0x0f) ; i++) {
+                           0x0f); i++) {
                        rf_rx_num++;
                        rx_pwr[i] = ((pphy_head[PHY_STAT_GAIN_TRSW_SHT + i]
                                    & 0x3F) * 2) - 110;

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index f16307f5d827e72707996c1299c8636e3448e000..7e324315e6ad30846166b9ea9a5bd0f2662e349a 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -965,7 +965,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
                        psta = r8712_alloc_stainfo(&padapter->stapriv,
                                                   pnetwork->MacAddress);
                        if (psta == NULL)
-                               goto createbss_cmd_fail ;
+                               goto createbss_cmd_fail;
                }
                r8712_indicate_connect(padapter);
        } else {

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index d58aa7e3b15cef799726d8bb4f4e656ddfaf7c91..9fec6eda8731c91612f038b370d5258b7adc6c3c 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -820,7 +820,7 @@ static int r871x_wx_set_pmkid(struct net_device *dev,
                        intReturn = true;
                blInserted = false;
                /* overwrite PMKID */
-               for (j = 0 ; j < NUM_PMKID_CACHE; j++) {
+               for (j = 0; j < NUM_PMKID_CACHE; j++) {
                        if (!memcmp(psecuritypriv->PMKIDList[j].Bssid,
                            strIssueBssid, ETH_ALEN)) {
                                /* BSSID is matched, the same AP => rewrite
@@ -845,7 +845,7 @@ static int r871x_wx_set_pmkid(struct net_device *dev,
                                PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN);
                        psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].
                                bUsed = true;
-                       psecuritypriv->PMKIDIndex++ ;
+                       psecuritypriv->PMKIDIndex++;
                        if (psecuritypriv->PMKIDIndex == NUM_PMKID_CACHE)
                                psecuritypriv->PMKIDIndex = 0;
                }
@@ -1598,7 +1598,7 @@ static int r8711_wx_set_enc(struct net_device *dev,
                wep.Length = wep.KeyLength +
                             FIELD_OFFSET(struct NDIS_802_11_WEP, KeyMaterial);
        } else {
-               wep.KeyLength = 0 ;
+               wep.KeyLength = 0;
                if (keyindex_provided == 1) { /* set key_id only, no given
                                               * KeyMaterial(erq->length==0).*/
                        padapter->securitypriv.PrivacyKeyIndex = key;
@@ -1880,7 +1880,7 @@ static int r8711_wx_write32(struct net_device *dev,
        u32 data32;
 
        get_user(addr, (u32 __user *)wrqu->data.pointer);
-       data32 = ((u32)wrqu->data.length<<16) | (u32)wrqu->data.flags ;
+       data32 = ((u32)wrqu->data.length<<16) | (u32)wrqu->data.flags;
        r8712_write32(padapter, addr, data32);
        return 0;
 }

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
index 5d6d55e7b38909d316b4ffa4528b5037170072ed..ac0baff7f090e5f12e9d552fb8162ec4d398e2f2 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_rtl.c
@@ -153,7 +153,7 @@ uint oid_rt_get_rx_icv_err_hdl(struct oid_par_priv *poid_par_priv)
                                         padapter->recvpriv.rx_icv_err;
                *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;
        } else
-               return RNDIS_STATUS_INVALID_LENGTH ;
+               return RNDIS_STATUS_INVALID_LENGTH;
        return RNDIS_STATUS_SUCCESS;
 }
 
@@ -169,7 +169,7 @@ uint oid_rt_get_preamble_mode_hdl(struct oid_par_priv *poid_par_priv)
 {
        struct _adapter *padapter = (struct _adapter *)
                                    (poid_par_priv->adapter_context);
-       u32 preamblemode = 0 ;
+       u32 preamblemode = 0;
 
        if (poid_par_priv->type_of_oid != QUERY_OID)
                return RNDIS_STATUS_NOT_ACCEPTED;
@@ -522,7 +522,7 @@ uint oid_rt_get_connect_state_hdl(struct oid_par_priv *poid_par_priv)
        else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)
                ulInfo = ADHOCMODE;
        else
-               ulInfo = NOTASSOCIATED ;
+               ulInfo = NOTASSOCIATED;
        *(u32 *)poid_par_priv->information_buf = ulInfo;
        *poid_par_priv->bytes_rw =  poid_par_priv->information_buf_len;
        return RNDIS_STATUS_SUCCESS;

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 659615481f6f4c1b8d387c572cc063a11cd9492c..8fa0f9d49a8aedb6800d25e07b004a61c4a18531 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -1641,7 +1641,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
        struct wlan_network     *cur_network = &adapter->mlmepriv.cur_network;
 
        pdev_network->Privacy = cpu_to_le32(psecuritypriv->PrivacyAlgrthm
-                                           > 0 ? 1 : 0) ; /* adhoc no 802.1x */
+                                           > 0 ? 1 : 0); /* adhoc no 802.1x */
        pdev_network->Rssi = 0;
        switch (pregistrypriv->wireless_mode) {
        case WIRELESS_11B:
@@ -1786,7 +1786,7 @@ static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len)
        psta = r8712_get_stainfo(&padapter->stapriv,
                                 pcur_network->network.MacAddress);
        if (psta) {
-               for (i = 0; i < 16 ; i++) {
+               for (i = 0; i < 16; i++) {
                        preorder_ctrl = &psta->recvreorder_ctrl[i];
                        preorder_ctrl->indicate_seq = 0xffff;
                        preorder_ctrl->wend_b = 0xffff;

diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c
index 5638d5e065ff7a05c919712040abb9300adcb16f..0563318a19ff40962984dd8b3094f34c3680ec29 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mp.c
+++ b/drivers/staging/rtl8712/rtl871x_mp.c
@@ -110,7 +110,7 @@ static u32 fw_iocmd_read(struct _adapter *pAdapter, struct IOCMD_STRUCT iocmd)
        u16 iocmd_value = iocmd.value;
        u8 iocmd_idx    = iocmd.index;
 
-       cmd32 = (iocmd_class << 24) | (iocmd_value << 8) | iocmd_idx ;
+       cmd32 = (iocmd_class << 24) | (iocmd_value << 8) | iocmd_idx;
        if (r8712_fw_cmd(pAdapter, cmd32))
                r8712_fw_cmd_data(pAdapter, &val32, 1);
        else
@@ -128,7 +128,7 @@ static u8 fw_iocmd_write(struct _adapter *pAdapter,
 
        r8712_fw_cmd_data(pAdapter, &value, 0);
        msleep(100);
-       cmd32 = (iocmd_class << 24) | (iocmd_value << 8) | iocmd_idx ;
+       cmd32 = (iocmd_class << 24) | (iocmd_value << 8) | iocmd_idx;
        return r8712_fw_cmd(pAdapter, cmd32);
 }
 
@@ -189,8 +189,8 @@ u32 r8712_rf_reg_read(struct _adapter *pAdapter, u8 path, u8 offset)
        u32 rf_data;
        struct IOCMD_STRUCT iocmd;
 
-       iocmd.cmdclass  = IOCMD_CLASS_BB_RF ;
-       iocmd.value     = rf_addr ;
+       iocmd.cmdclass  = IOCMD_CLASS_BB_RF;
+       iocmd.value     = rf_addr;
        iocmd.index     = IOCMD_RF_READ_IDX;
        rf_data = fw_iocmd_read(pAdapter, iocmd);
        return rf_data;

diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
index e33fd6db246d9e80bd43aa732a2c86c23f2e1444..5349669707c04d7785564cfd1e153a90ff6e8578 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_security.c
+++ b/drivers/staging/rtl8712/rtl871x_security.c
@@ -835,7 +835,7 @@ static void mix_column(u8 *in, u8 *out)
        u8 temp[4];
        u8 tempb[4];
 
-       for (i = 0 ; i < 4; i++) {
+       for (i = 0; i < 4; i++) {
                if ((in[i] & 0x80) == 0x80)
                        add1b[i] = 0x1b;
                else
@@ -1187,7 +1187,7 @@ u32 r8712_aes_encrypt(struct _adapter *padapter, u8 *pxmitframe)
                                        length = pxmitpriv->frag_len -
                                                 pattrib->hdrlen -
                                                 pattrib->iv_len -
-                                                pattrib->icv_len ;
+                                                pattrib->icv_len;
                                        aes_cipher(prwskey, pattrib->
                                                   hdrlen, pframe, length);
                                        pframe += pxmitpriv->frag_len;
@@ -1315,7 +1315,7 @@ static sint aes_decipher(u8 *key, uint    hdrlen,
                bitwise_xor(aes_out, padded_buffer, chain_buffer);
                aes128k128d(key, chain_buffer, aes_out);
        }
-       for (j = 0 ; j < 8; j++)
+       for (j = 0; j < 8; j++)
                mic[j] = aes_out[j];
        /* Insert MIC into payload */
        for (j = 0; j < 8; j++)

diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 1247b3d9719db5f279e770bbf8cd2234d38cc7be..8db6849d4b24a0f35e438a0bf369dd9c69833465 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -138,7 +138,7 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
                }
                phash_list = &(pstapriv->sta_hash[index]);
                list_insert_tail(&psta->hash_list, phash_list);
-               pstapriv->asoc_sta_count++ ;
+               pstapriv->asoc_sta_count++;
 
 /* For the SMC router, the sequence number of first packet of WPS handshake
  * will be 0. In this case, this packet will be dropped by recv_decache function
@@ -149,7 +149,7 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
                        memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i],
                                &wRxSeqInitialValue, 2);
                /* for A-MPDU Rx reordering buffer control */
-               for (i = 0; i < 16 ; i++) {
+               for (i = 0; i < 16; i++) {
                        preorder_ctrl = &psta->recvreorder_ctrl[i];
                        preorder_ctrl->padapter = pstapriv->padapter;
                        preorder_ctrl->indicate_seq = 0xffff;

diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index 4d22bb7008f8456e378c3568d3252be7ede9a79f..0ac9130faf6cad9cb298e8b8a44e9863a81328cf 100644 (file)
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -51,7 +51,7 @@ void _r8712_open_pktfile(_pkt *pktptr, struct pkt_file *pfile)
        pfile->pkt = pktptr;
        pfile->cur_addr = pfile->buf_start = pktptr->data;
        pfile->pkt_len = pfile->buf_len = pktptr->len;
-       pfile->cur_buffer = pfile->buf_start ;
+       pfile->cur_buffer = pfile->buf_start;
 }
 
 uint _r8712_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)