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

staging: r8188eu: Replace wrappers ODM_sleep_us and rtw_usleep_os 



Each of the uses in the code asks for a sleep of 100 usec or so. On Linux,
these are converted to msleep(1).

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69cb4a8d

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) 
			DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);

			break;

		}

		rtw_usleep_os(100);

		msleep(1);

	}



	return err;

drivers/staging/rtl8188eu/hal/odm_interface.c

+0 −6
Original line number Diff line number Diff line
@@ -146,12 +146,6 @@ void ODM_IsWorkItemScheduled(void *pRtWorkItem) 
{

}



/*  ODM Timer relative API. */

void ODM_sleep_us(u32 us)

{

	rtw_usleep_os(us);

}



void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer, u32 msDelay)

{

	_set_timer(pTimer, msDelay); /* ms */

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+3 −3
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void efuse_read_phymap_from_txpktbuf( 
		while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) &&

		       (passing_time = rtw_get_passing_time_ms(start)) < 1000) {

			DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106));

			rtw_usleep_os(100);

			msleep(1);

		}



		lo32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_L);
@@ -372,7 +372,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len) 
	if (pbuf) {

		for (addr = 0; addr < data_cnts; addr++) {

			rtw_write32(Adapter, 0x140, addr);

			rtw_usleep_os(2);

			msleep(1);

			loop = 0;

			do {

				rstatus = (reg_140 = rtw_read32(Adapter, REG_PKTBUF_DBG_CTRL)&BIT24);
@@ -383,7 +383,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len) 
					fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_H);

					memcpy(pbuf+(addr*8+4), &fifo_data, 4);

				}

				rtw_usleep_os(2);

				msleep(1);

			} while (!rstatus && (loop++ < 10));

		}

		rtw_IOL_cmd_buf_dump(Adapter, data_len, pbuf);

drivers/staging/rtl8188eu/hal/rtl8188e_mp.c

+8 −8
Original line number Diff line number Diff line
@@ -663,18 +663,18 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) 


		if (is92C) {

			_write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x01);

			rtw_usleep_os(100);

			msleep(1);

			if (rfPath == RF_PATH_A)

				write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x10000); /*  PAD all on. */

			else if (rfPath == RF_PATH_B)

				write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x10000); /*  PAD all on. */

			write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */

			rtw_usleep_os(100);

			msleep(1);

		} else {

			write_rfreg(pAdapter, rfPath, 0x21, 0xd4000);

			rtw_usleep_os(100);

			msleep(1);

			write_rfreg(pAdapter, rfPath, 0x00, 0x2001f); /*  PAD all on. */

			rtw_usleep_os(100);

			msleep(1);

		}



		/* for dynamic set Power index. */
@@ -696,15 +696,15 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) 
		write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1);

		if (is92C) {

			_write_rfreg(pAdapter, RF_PATH_A, 0x21, BIT19, 0x00);

			rtw_usleep_os(100);

			msleep(1);

			write_rfreg(pAdapter, RF_PATH_A, 0x00, 0x32d75); /*  PAD all on. */

			write_rfreg(pAdapter, RF_PATH_B, 0x00, 0x32d75); /*  PAD all on. */

			rtw_usleep_os(100);

			msleep(1);

		} else {

			write_rfreg(pAdapter, rfPath, 0x21, 0x54000);

			rtw_usleep_os(100);

			msleep(1);

			write_rfreg(pAdapter, rfPath, 0x00, 0x30000); /*  PAD all on. */

			rtw_usleep_os(100);

			msleep(1);

		}



		/* Stop for dynamic set Power index. */

drivers/staging/rtl8188eu/include/odm_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ void ODM_ScheduleWorkItem(void *pRtWorkItem); 
void ODM_IsWorkItemScheduled(void *pRtWorkItem);



/*  ODM Timer relative API. */

void ODM_sleep_us(u32 us);



void ODM_SetTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTimer,

		  u32 msDelay);