staging: r8188eu: remove return from void functions

Remove return from void functions to clear checkpatch warnings.

WARNING: void function return statements are not generally useful

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210801210354.25218-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 2988492..007b9d5 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -326,8 +326,6 @@ void rtw_generate_random_ibss(u8 *pibss)
        pibss[3] = (u8)(curtime & 0xff);/* p[0]; */
        pibss[4] = (u8)((curtime>>8) & 0xff);/* p[1]; */
        pibss[5] = (u8)((curtime>>16) & 0xff);/* p[2]; */
-
-       return;
 }
 
 u8 *rtw_get_capability_from_ie(u8 *ie)
@@ -698,10 +696,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *
 /* TODO: Perry: For Power Management */
 void rtw_atimdone_event_callback(struct adapter        *adapter, u8 *pbuf)
 {
-
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("receive atimdone_evet\n"));
-
-       return;
 }
 
 void rtw_survey_event_callback(struct adapter  *adapter, u8 *pbuf)
@@ -748,8 +743,6 @@ void rtw_survey_event_callback(struct adapter       *adapter, u8 *pbuf)
 exit:
 
        spin_unlock_bh(&pmlmepriv->lock);
-
-       return;
 }
 
 void rtw_surveydone_event_callback(struct adapter      *adapter, u8 *pbuf)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index c42bdbd..72b0774 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -2147,8 +2147,6 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame_body, uint len, u8 result)
@@ -2512,7 +2510,6 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-       return;
 }
 
 static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
@@ -2675,7 +2672,6 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)
        pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, p2pielen, (unsigned char *)p2pie, &pattrib->pktlen);
        pattrib->last_txcmdsz = pattrib->pktlen;
        dump_mgntframe(padapter, pmgntframe);
-       return;
 }
 
 void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
@@ -2923,8 +2919,6 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialogToken, u8 status_code)
@@ -3115,8 +3109,6 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidlen, u8 *pdev_raddr)
@@ -3212,8 +3204,6 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 static u8 is_matched_in_profilelist(u8 *peermacaddr, struct profile_info *profileinfo)
@@ -3478,8 +3468,6 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
@@ -4811,8 +4799,6 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack)
@@ -5082,8 +5068,6 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
        rtw_wep_encrypt(padapter, (u8 *)pmgntframe);
        DBG_88E("%s\n", __func__);
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type)
@@ -5551,8 +5535,6 @@ exit:
                rtw_buf_update(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len, (u8 *)pwlanhdr, pattrib->pktlen);
        else
                rtw_buf_free(&pmlmepriv->assoc_req, &pmlmepriv->assoc_req_len);
-
-       return;
 }
 
 /* when wait_ack is ture, this function shoule be called at process context */
@@ -6468,7 +6450,6 @@ void site_survey(struct adapter *padapter)
                        issue_action_BSSCoexistPacket(padapter);
                }
        }
-       return;
 }
 
 /* collect bss info from Beacon and Probe request/response frames. */
@@ -7023,8 +7004,6 @@ void report_survey_event(struct adapter *padapter, struct recv_frame *precv_fram
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
 
        pmlmeext->sitesurvey_res.bss_cnt++;
-
-       return;
 }
 
 void report_surveydone_event(struct adapter *padapter)
@@ -7068,8 +7047,6 @@ void report_surveydone_event(struct adapter *padapter)
        DBG_88E("survey done event(%x)\n", psurveydone_evt->bss_cnt);
 
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
-
-       return;
 }
 
 void report_join_res(struct adapter *padapter, int res)
@@ -7118,8 +7095,6 @@ void report_join_res(struct adapter *padapter, int res)
        rtw_joinbss_event_prehandle(padapter, (u8 *)&pjoinbss_evt->network);
 
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
-
-       return;
 }
 
 void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)
@@ -7174,8 +7149,6 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
        DBG_88E("report_del_sta_event: delete STA, mac_id =%d\n", mac_id);
 
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
-
-       return;
 }
 
 void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cam_idx)
@@ -7220,8 +7193,6 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
        DBG_88E("report_add_sta_event: add STA\n");
 
        rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
-
-       return;
 }
 
 /****************************************************************************
@@ -7662,7 +7633,6 @@ void link_timer_hdl(struct adapter *padapter)
                issue_assocreq(padapter);
                set_link_timer(pmlmeext, REASSOC_TO);
        }
-       return;
 }
 
 void addba_timer_hdl(struct sta_info *psta)

diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188eu/core/rtw_p2p.c
index ce30161..c19360e 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_p2p.c
+++ b/drivers/staging/r8188eu/core/rtw_p2p.c
@@ -312,8 +312,6 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe(padapter, pmgntframe);
-
-       return;
 }
 
 static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 status, u8 dialogToken)

diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
index fa0d8be..2c029f8 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
@@ -189,7 +189,6 @@ void rtw_ps_processor(struct adapter *padapter)
 exit:
        rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
        pwrpriv->ps_processing = false;
-       return;
 }
 
 static void pwr_state_check_handler(struct timer_list *t)

diff --git a/drivers/staging/r8188eu/core/rtw_security.c b/drivers/staging/r8188eu/core/rtw_security.c
index 66c730a..df8107a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_security.c
+++ b/drivers/staging/r8188eu/core/rtw_security.c
@@ -180,8 +180,6 @@ void rtw_wep_decrypt(struct adapter  *padapter, u8 *precvframe)
                                 &crc, &payload[length-4]));
                }
        }
-
-       return;
 }
 
 /* 3           ===== TKIP related ===== */

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index 8603a29..c4e2726 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -648,8 +648,6 @@ void WMMOnAssocRsp(struct adapter *padapter)
                pxmitpriv->wmm_para_seq[i] = inx[i];
                DBG_88E("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
        }
-
-       return;
 }
 
 static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
@@ -777,7 +775,6 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
                else
                        pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
        }
-       return;
 }
 
 void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
@@ -798,7 +795,6 @@ void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
 
        pmlmeinfo->HT_info_enable = 1;
        memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->Length);
-       return;
 }
 
 void HTOnAssocRsp(struct adapter *padapter)

diff --git a/drivers/staging/r8188eu/hal/odm_RTL8188E.c b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
index 62219a9..03fe29e 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm_RTL8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RTL8188E.c
@@ -345,5 +345,4 @@ bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *dm_odm)
 
 void odm_DynamicPrimaryCCA(struct odm_dm_struct *dm_odm)
 {
-       return;
 }

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index 0e264c3..b5f4212 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -182,7 +182,6 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
 skip_dm:
        /*  Check GPIO to determine current RF on/off and Pbc status. */
        /*  Check Hardware Radio ON/OFF or not */
-       return;
 }
 
 void rtl8188e_init_dm_priv(struct adapter *Adapter)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_mp.c b/drivers/staging/r8188eu/hal/rtl8188e_mp.c
index 510906c..a7893aa 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_mp.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_mp.c
@@ -67,8 +67,6 @@ void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter)
                pmp->MptCtx.backup0x52_RF_B = (u8)PHY_QueryRFReg(pAdapter, RF_PATH_B, RF_0x52, 0x000F0);
                PHY_SetRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0, 0xD);
                PHY_SetRFReg(pAdapter, RF_PATH_B, RF_0x52, 0x000F0, 0xD);
-
-       return;
 }
 /*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/
 

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index bc7f4bd..ffa2f15 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -808,8 +808,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
 
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n"));
        DBG_88E("-r871xu_dev_remove, done\n");
-
-       return;
 }
 
 static int __init rtw_drv_entry(void)