Skip to contentSkip to conversation

staging: r8188eu: remove return from void functions

PATCH New Michael Straube 1 participant 2 messages Aug 1, 2021 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_mlme.c      |  7 -----
 drivers/staging/r8188eu/core/rtw_mlme_ext.c  | 30 --------------------
 drivers/staging/r8188eu/core/rtw_p2p.c       |  2 --
 drivers/staging/r8188eu/core/rtw_pwrctrl.c   |  1 -
 drivers/staging/r8188eu/core/rtw_security.c  |  2 --
 drivers/staging/r8188eu/core/rtw_wlan_util.c |  4 ---
 drivers/staging/r8188eu/hal/odm_RTL8188E.c   |  1 -
 drivers/staging/r8188eu/hal/rtl8188e_dm.c    |  1 -
 drivers/staging/r8188eu/hal/rtl8188e_mp.c    |  2 --
 drivers/staging/r8188eu/os_dep/usb_intf.c    |  2 --
 10 files changed, 52 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +0 -7
index af4b7053686f..3ee83f2dc1c9 100644
@@ -330,8 +330,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)

@@ -702,10 +700,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)

@@ -752,8 +747,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)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +0 -30
index 00650888a2e3..62c77800bfd1 100644
@@ -2149,8 +2149,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)

@@ -2514,7 +2512,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)

@@ -2677,7 +2674,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)

@@ -2925,8 +2921,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)

@@ -3117,8 +3111,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)

@@ -3214,8 +3206,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)

@@ -3480,8 +3470,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)

@@ -4813,8 +4801,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)

@@ -5084,8 +5070,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)

@@ -5556,8 +5540,6 @@ void issue_assocreq(struct adapter *padapter)
 		pmlmepriv->assoc_req = NULL;
 		pmlmepriv->assoc_req_len = 0;
 	}
-
-	return;
 }
 
 /* when wait_ack is ture, this function shoule be called at process context */

@@ -6473,7 +6455,6 @@ void site_survey(struct adapter *padapter)
 			issue_action_BSSCoexistPacket(padapter);
 		}
 	}
-	return;
 }
 
 /* collect bss info from Beacon and Probe request/response frames. */

@@ -7028,8 +7009,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)

@@ -7073,8 +7052,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)

@@ -7123,8 +7100,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)

@@ -7179,8 +7154,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)

@@ -7225,8 +7198,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;
 }
 
 /****************************************************************************

@@ -7667,7 +7638,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)
drivers/staging/r8188eu/core/rtw_p2p.c +0 -2
index ce30161535c1..c19360ea09a4 100644
@@ -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)
drivers/staging/r8188eu/core/rtw_pwrctrl.c +0 -1
index d67eeb045002..80268a7d4388 100644
@@ -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)
drivers/staging/r8188eu/core/rtw_security.c +0 -2
index 66c730a5d754..df8107a0f5f2 100644
@@ -180,8 +180,6 @@ void rtw_wep_decrypt(struct adapter  *padapter, u8 *precvframe)
 				 &crc, &payload[length-4]));
 		}
 	}
-
-	return;
 }
 
 /* 3		===== TKIP related ===== */
drivers/staging/r8188eu/core/rtw_wlan_util.c +0 -4
index db133ffad8f9..4bc42f18d6cc 100644
@@ -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)
drivers/staging/r8188eu/hal/odm_RTL8188E.c +0 -1
index 62219a908097..03fe29e16f1d 100644
@@ -345,5 +345,4 @@ bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *dm_odm)
 
 void odm_DynamicPrimaryCCA(struct odm_dm_struct *dm_odm)
 {
-	return;
 }
drivers/staging/r8188eu/hal/rtl8188e_dm.c +0 -1
index 0e264c39d636..b5f42127a751 100644
@@ -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)
drivers/staging/r8188eu/hal/rtl8188e_mp.c +0 -2
index 510906cc6007..a7893aa469ac 100644
@@ -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---------------------------*/
drivers/staging/r8188eu/os_dep/usb_intf.c +0 -2
index bc7f4bd7ce0b..ffa2f150f937 100644
@@ -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)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 2/2 staging: r8188eu: remove empty function odm_DynamicPrimaryCCA()

Function odm_DynamicPrimaryCCA() does nothing, remove it.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/hal/odm.c              | 1 -
 drivers/staging/r8188eu/hal/odm_RTL8188E.c     | 4 ----
 drivers/staging/r8188eu/include/odm_RTL8188E.h | 2 --
 3 files changed, 7 deletions(-)
drivers/staging/r8188eu/hal/odm.c +0 -1
index 0bc836311036..08ec1e18b3f0 100644
@@ -211,7 +211,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
 	odm_RefreshRateAdaptiveMask(pDM_Odm);
 
 	odm_DynamicBBPowerSaving(pDM_Odm);
-	odm_DynamicPrimaryCCA(pDM_Odm);
 	if ((pDM_Odm->AntDivType ==  CG_TRX_HW_ANTDIV)	||
 	    (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)	||
 	    (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
drivers/staging/r8188eu/hal/odm_RTL8188E.c +0 -4
index 03fe29e16f1d..792284eac01f 100644
@@ -342,7 +342,3 @@ bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *dm_odm)
 
 	return	PrimaryCCA->DupRTS_flag;
 }
-
-void odm_DynamicPrimaryCCA(struct odm_dm_struct *dm_odm)
-{
-}
drivers/staging/r8188eu/include/odm_RTL8188E.h +0 -2
index d6718186f2d6..776a8a6dab68 100644
@@ -35,6 +35,4 @@ void odm_PrimaryCCA_Init(struct odm_dm_struct *pDM_Odm);
 
 bool ODM_DynamicPrimaryCCA_DupRTS(struct odm_dm_struct *pDM_Odm);
 
-void odm_DynamicPrimaryCCA(struct odm_dm_struct *pDM_Odm);
-
 #endif
Signature · 1 line
2.32.0