Commit d21edee5 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Remove wrapper routine rtw_msleep_os() 



The effect of this macro is to call msleep(). Remove the wrapper.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Link: https://lore.kernel.org/r/20210805192644.15978-2-Larry.Finger@lwfinger.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e08f5b7

drivers/staging/r8188eu/core/rtw_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) 


	_cancel_workitem_sync(&pevtpriv->c2h_wk);

	while (pevtpriv->c2h_wk_alive)

		rtw_msleep_os(10);

		msleep(10);



	while (!rtw_cbuf_empty(pevtpriv->c2h_queue)) {

		void *c2h = rtw_cbuf_pop(pevtpriv->c2h_queue);
@@ -1820,7 +1820,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) 
		rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val);



		while (!val) {

			rtw_msleep_os(100);

			msleep(100);



			cnt++;

drivers/staging/r8188eu/core/rtw_mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ void rtw_scan_abort(struct adapter *adapter) 
		if (adapter->bDriverStopped || adapter->bSurpriseRemoved)

			break;

		DBG_88E(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev));

		rtw_msleep_os(20);

		msleep(20);

	}

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {

		if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+8 −8
Original line number Diff line number Diff line
@@ -3776,7 +3776,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait 
			break;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			rtw_msleep_os(wait_ms);

			msleep(wait_ms);

	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));



	if (ret != _FAIL) {
@@ -4913,7 +4913,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, 
			break;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			rtw_msleep_os(wait_ms);

			msleep(wait_ms);



	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));
@@ -5628,7 +5628,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow 
			break;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			rtw_msleep_os(wait_ms);

			msleep(wait_ms);

	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));



	if (ret != _FAIL) {
@@ -5751,7 +5751,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int 
			break;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			rtw_msleep_os(wait_ms);

			msleep(wait_ms);

	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));



	if (ret != _FAIL) {
@@ -5862,7 +5862,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int 
			break;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			rtw_msleep_os(wait_ms);

			msleep(wait_ms);

	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));



	if (ret != _FAIL) {
@@ -6350,7 +6350,7 @@ void site_survey(struct adapter *padapter) 
					if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {

						/* todo: to issue two probe req??? */

						issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);

						/* rtw_msleep_os(SURVEY_TO>>1); */

						/* msleep(SURVEY_TO>>1); */

						issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL);

					}

				}
@@ -6358,7 +6358,7 @@ void site_survey(struct adapter *padapter) 
				if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) {

					/* todo: to issue two probe req??? */

					issue_probereq(padapter, NULL, NULL);

					/* rtw_msleep_os(SURVEY_TO>>1); */

					/* msleep(SURVEY_TO>>1); */

					issue_probereq(padapter, NULL, NULL);

				}

			}
@@ -8255,7 +8255,7 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) 
			return H2C_SUCCESS;



		if ((pstapriv->tim_bitmap&BIT(0)) && (psta_bmc->sleepq_len > 0)) {

			rtw_msleep_os(10);/*  10ms, ATIM(HIQ) Windows */

			msleep(10);/*  10ms, ATIM(HIQ) Windows */

			spin_lock_bh(&psta_bmc->sleep_q.lock);



			xmitframe_phead = get_list_head(&psta_bmc->sleep_q);

drivers/staging/r8188eu/core/rtw_mp.c

+2 −2
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static int mp_xmit_packet_thread(void *context) 
			    padapter->bDriverStopped) {

				goto exit;

			} else {

				rtw_msleep_os(1);

				msleep(1);

				continue;

			}

		}
@@ -895,7 +895,7 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data) 
		i++;

	}



	rtw_msleep_os(100);

	msleep(100);

	return strlen(data)+1;

}

drivers/staging/r8188eu/core/rtw_mp_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ int rtl8188eu_oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_pri 
		if (pmp_priv->tx.stop == 0) {

			pmp_priv->tx.stop = 1;

			DBG_88E("%s: pkt tx is running...\n", __func__);

			rtw_msleep_os(5);

			msleep(5);

		}

		pmp_priv->tx.stop = 0;

		pmp_priv->tx.count = 1;
@@ -542,7 +542,7 @@ int rtl8188eu_oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par 
		if (pmp_priv->tx.stop == 0) {

			pmp_priv->tx.stop = 1;

			DBG_88E("%s: pkt tx is running...\n", __func__);

			rtw_msleep_os(5);

			msleep(5);

		}

		pmp_priv->tx.stop = 0;

		pmp_priv->tx.count = 1;
@@ -571,7 +571,7 @@ int rtl8188eu_oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poi 
		if (pmp_priv->tx.stop == 0) {

			pmp_priv->tx.stop = 1;

			DBG_88E("%s: pkt tx is running...\n", __func__);

			rtw_msleep_os(5);

			msleep(5);

		}

		pmp_priv->tx.stop = 0;

		pmp_priv->tx.count = 1;