staging: rtl8188eu: remove blank lines
PATCH 1/1 staging: rtl8188eu: remove blank lines
Remove unrequired blank lines as reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>
--- .../staging/rtl8188eu/core/rtw_ieee80211.c | 8 ---- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 18 -------- drivers/staging/rtl8188eu/core/rtw_led.c | 1 - drivers/staging/rtl8188eu/core/rtw_mlme.c | 5 --- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 45 ------------------- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 6 --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 27 ----------- 7 files changed, 110 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +0 -8
@@ -57,7 +57,6 @@ static u8 WIFI_OFDMRATES[] = {IEEE80211_OFDM_RATE_54MB }; -int rtw_get_bit_value_from_ieee_value (u8 val) {unsigned char dot11_rate_table[] = {
@@ -218,7 +217,6 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;u8 *ie = pdev_network->ies; -/* timestamp will be inserted by hardware */ sz +=8 ; ie += sz;
@@ -356,7 +354,6 @@ int rtw_get_wpa2_cipher_suite(u8 *s)return 0 ; } -int rtw_parse_wpa_ie (u8 *wpa_ie,int wpa_ie_len,int *group_cipher,int *pairwise_cipher,int *is_8021x) {int i, ret = _SUCCESS;
@@ -369,7 +366,6 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwisreturn _FAIL; } -if ((*wpa_ie != _WPA_IE_ID_) || (*(wpa_ie +1 ) != (u8)(wpa_ie_len -2 )) || (memcmp (wpa_ie +2 ,RTW_WPA_OUI_TYPE ,WPA_SELECTOR_LEN )))return _FAIL;
@@ -379,7 +375,6 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis pos +=8 ; left = wpa_ie_len -8 ; -/* group_cipher */ if (left >=WPA_SELECTOR_LEN ) { *group_cipher =rtw_get_wpa_cipher_suite (pos);
@@ -438,7 +433,6 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwireturn _FAIL; } -if ((*rsn_ie != _WPA2_IE_ID_) || (*(rsn_ie +1 ) != (u8)(rsn_ie_len -2 )))return _FAIL;
@@ -501,7 +495,6 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,u8 wpa_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x01 };uint cnt; -/* Search required WPA or WPA2 IE and copy to sec_ie[] */ cnt = _TIMESTAMP_ + _BEACON_ITERVAL_ + _CAPABILITY_;
@@ -554,7 +547,6 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, } } -return *rsn_len + *wpa_len; }
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -18
@@ -21,7 +21,6 @@ u8 rtw_do_join(struct adapter *padapter)struct __queue *queue = &(pmlmepriv->scanned_queue);u8 ret = _SUCCESS; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); phead =get_list_head (queue); plist = phead->next;
@@ -115,8 +114,6 @@ u8 rtw_do_join(struct adapter *padapter) } exit: - -return ret; }
@@ -126,7 +123,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)u32 cur_time =0 ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -DBG_88E_LEVEL (_drv_info_,"set bssid:%pM\n" , bssid); if ((bssid[0] == 0x00 && bssid[1] == 0x00 && bssid[2] == 0x00 &&
@@ -139,7 +135,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)spin_lock_bh (&pmlmepriv->lock); -DBG_88E ("Set BSSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv));if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) goto handle_tkip_countermeasure;
@@ -201,7 +196,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("%s: status=%d\n" , __func__, status)); -return status; }
@@ -213,7 +207,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *pnetwork = &pmlmepriv->cur_network; -DBG_88E_LEVEL (_drv_info_,"set ssid [%s] fw_state=0x%08x\n" , ssid->Ssid,get_fwstate (pmlmepriv));
@@ -319,7 +312,6 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,struct wlan_network *cur_network = &pmlmepriv->cur_network;enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_notice_, ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n" , *pold_state, networktype,get_fwstate (pmlmepriv)));
@@ -376,16 +368,13 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,spin_unlock_bh (&pmlmepriv->lock); } -return true; } -u8 rtw_set_802_11_disassociate (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -spin_lock_bh (&pmlmepriv->lock);if (check_fwstate (pmlmepriv, _FW_LINKED)) {
@@ -400,7 +389,6 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)spin_unlock_bh (&pmlmepriv->lock); -return true; }
@@ -409,7 +397,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_sstruct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 res = true; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("+%s(), fw_state =%x\n" , __func__,get_fwstate (pmlmepriv)));if (!padapter) {
@@ -448,8 +435,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_sspin_unlock_bh (&pmlmepriv->lock); } exit: - -return res; }
@@ -459,7 +444,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11int res;u8 ret; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n" , authmode)); psecuritypriv->ndisauthtype = authmode;
@@ -478,7 +462,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11else ret = false; -return ret; }
@@ -488,7 +471,6 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)struct security_priv *psecuritypriv = &(padapter->securitypriv);u8 ret = _SUCCESS; - keyid = wep->KeyIndex &0x3fffffff ;if (keyid >=4 ) {
drivers/staging/rtl8188eu/core/rtw_led.c +0 -1
@@ -69,7 +69,6 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)INIT_WORK (&pLed->BlinkWorkItem, BlinkWorkItemCallback); } -/* */ /* Description: */ /* DeInitialize an LED_871x object. */
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -5
@@ -201,7 +201,6 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)return pnetwork; } -void rtw_free_network_queue (struct adapter *padapter,u8 isfreeall) {struct list_head *phead, *plist;
@@ -257,7 +256,6 @@ u8 *rtw_get_capability_from_ie(u8 *ie)return ie +8 +2 ; } -u16 rtw_get_capability (struct wlan_bssid_ex *bss) {__le16 val;
@@ -526,7 +524,6 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * bselected = false; } -if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy ==0 )) {DBG_88E ("desired_encmode: %d, privacy: %d\n" , desired_encmode, privacy); bselected = false;
@@ -762,7 +759,6 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter)rtw_init_bcmc_stainfo (adapter); } - pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);if (pwlan) pwlan->fixed = false;
@@ -936,7 +932,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net ("\nfw_state:%x, BSSID:%pM\n" , get_fwstate(pmlmepriv), pnetwork->network.MacAddress)); -/* why not use ptarget_wlan?? */ memcpy (&cur_network->network, &pnetwork->network, pnetwork->network.Length);/* some ies in pnetwork is wrong, so we should use ptarget_wlan ies */
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -45
290 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +0 -6
@@ -17,7 +17,6 @@ static int rtw_hw_suspend(struct adapter *padapter)struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;struct net_device *pnetdev = padapter->pnetdev; -if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) { DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
@@ -79,7 +78,6 @@ static int rtw_hw_resume(struct adapter *padapter)struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;struct net_device *pnetdev = padapter->pnetdev; -/* system resume */ DBG_88E ("==> %s\n" , __func__);mutex_lock (&pwrpriv->mutex_lock);
@@ -107,7 +105,6 @@ static int rtw_hw_resume(struct adapter *padapter)mutex_unlock (&pwrpriv->mutex_lock); -return 0 ; error_exit:DBG_88E ("%s, Open net dev failed\n" , __func__);
@@ -162,7 +159,6 @@ int ips_leave(struct adapter *padapter)int result = _SUCCESS;int keyid; -mutex_lock (&pwrpriv->mutex_lock);if ((pwrpriv->rf_pwrstate == rf_off) && (!pwrpriv->bips_processing)) {
@@ -342,7 +338,6 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - curr_time = jiffies; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
@@ -412,7 +407,6 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)u8 bAwake = false;s32 err =0 ; - start_time = jiffies;while (1 ) {rtw_hal_get_hwreg (padapter,HW_VAR_FWLPS_RF_ON , &bAwake);
drivers/staging/rtl8188eu/core/rtw_xmit.c +0 -27
@@ -44,7 +44,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)u32 max_xmit_extbuf_size =MAX_XMIT_EXTBUF_SZ ;u32 num_xmit_extbuf =NR_XMIT_EXTBUFF ; -/* We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */ spin_lock_init (&pxmitpriv->lock);
@@ -200,8 +199,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)rtw_hal_init_xmit_priv (padapter); exit: - -return res; }
@@ -585,8 +582,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pupdate_attrib_phy_info (pattrib, psta); exit: - -return res; }
@@ -608,7 +603,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfrelse stainfo =rtw_get_stainfo (&padapter->stapriv, &pattrib->ra[0 ]); - hw_hdr_offset =TXDESC_SIZE + (pxmitframe->pkt_offset *PACKET_OFFSET_SZ );if (pattrib->encrypt == _TKIP_) {/* if (psecuritypriv->dot11PrivacyAlgrthm == _TKIP_PRIVACY_) */
@@ -705,7 +699,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr } } -return _SUCCESS; }
@@ -713,7 +706,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi {struct pkt_attrib *pattrib = &pxmitframe->attrib; -if (pattrib->bswenc) {RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("### %s\n" , __func__));switch (pattrib->encrypt) {
@@ -734,7 +726,6 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmiRT_TRACE (_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n" )); } -return _SUCCESS; }
@@ -754,7 +745,6 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrint bmcst =IS_MCAST (pattrib->ra); -if (pattrib->psta) { psta = pattrib->psta; }else {
@@ -1075,8 +1065,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct pattrib->vcs_mode =NONE_VCS ; exit: - -return res; }
@@ -1092,7 +1080,6 @@ s32 rtw_put_snap(u8 *data, u16 h_proto)struct ieee80211_snap_hdr *snap;u8 *oui; - snap = (struct ieee80211_snap_hdr *)data; snap->dsap =0xaa ; snap->ssap =0xaa ;
@@ -1109,7 +1096,6 @@ s32 rtw_put_snap(u8 *data, u16 h_proto) *(__be16 *)(data +SNAP_SIZE ) =htons (h_proto); -return SNAP_SIZE +sizeof (u16); }
@@ -1120,7 +1106,6 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv; -switch (pxmitpriv->vcs_setting) {case DISABLE_VCS : pxmitpriv->vcs =NONE_VCS ;
@@ -1196,7 +1181,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)unsigned long irql;struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; -if (!pxmitbuf)return _FAIL;
@@ -1209,7 +1193,6 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)spin_unlock_irqrestore (&pfree_queue->lock, irql); -return _SUCCESS; }
@@ -1264,7 +1247,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, irql); } -return _SUCCESS; }
@@ -1333,7 +1315,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframstruct adapter *padapter = pxmitpriv->adapter;struct sk_buff *pndis_pkt =NULL ; -if (!pxmitframe) {RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("====== %s:pxmitframe == NULL!!!!!!!!!!\n" , __func__)); goto exit;
@@ -1359,8 +1340,6 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframrtw_os_pkt_complete (padapter, pndis_pkt); exit: - -return _SUCCESS; }
@@ -1369,7 +1348,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframstruct list_head *plist, *phead;struct xmit_frame *pxmitframe; -spin_lock_bh (&pframequeue->lock); phead =get_list_head (pframequeue);
@@ -1428,7 +1406,6 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmistruct registry_priv *pregpriv = &padapter->registrypriv;int i, inx[4 ]; - inx[0 ] =0 ; inx[1 ] =1 ; inx[2 ] =2 ; inx[3 ] =3 ;if (pregpriv->wifi_spec ==1 ) {
@@ -1502,7 +1479,6 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *break ; } -return ptxservq; }
@@ -1520,7 +1496,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;int res = _SUCCESS; -if (pattrib->psta) psta = pattrib->psta;else
@@ -1542,8 +1517,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe) ptxservq->qcnt++; phwxmits[ac_index].accnt++; exit: - -return res; }
Signature · 1 line
2.18.0