Commit 80e29c7a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: wilc1000: remove WILC_Sleep() 



It was just a wrapper around usleep_range() so call that directly
instead and remove the now-empty file.

Cc: Johnny Kim <johnny.kim@atmel.com>
Cc: Rachel Kim <rachel.kim@atmel.com>
Cc: Dean Lee <dean.lee@atmel.com>
Cc: Chris Park <chris.park@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb7b1a76

drivers/staging/wilc1000/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC 




wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \

			wilc_memory.o wilc_msgqueue.o wilc_sleep.o \

			wilc_memory.o wilc_msgqueue.o \

			wilc_timer.o coreconfigurator.o host_interface.o \

			wilc_sdio.o wilc_spi.o wilc_wlan_cfg.o wilc_debugfs.o

drivers/staging/wilc1000/host_interface.c

+2 −2
Original line number Diff line number Diff line
@@ -4339,7 +4339,7 @@ static int hostIFthread(void *pvArg) 
		/*Re-Queue HIF message*/

		if ((!g_wilc_initialized)) {

			PRINT_D(GENERIC_DBG, "--WAIT--");

			WILC_Sleep(200);

			usleep_range(200 * 1000, 200 * 1000);

			WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);

			continue;

		}
@@ -4347,7 +4347,7 @@ static int hostIFthread(void *pvArg) 
		if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {

			PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");

			WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);

			WILC_Sleep(2);

			usleep_range(2 * 1000, 2 * 1000);

			continue;

		}

drivers/staging/wilc1000/wilc_oswrapper.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
/* Error reporting and handling support */

#include "wilc_errorsupport.h"



/* Sleep support */

#include "wilc_sleep.h"



/* Timer support */

#include "wilc_timer.h"

drivers/staging/wilc1000/wilc_sleep.c

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 


#include "wilc_sleep.h"



/*

 *  @author	mdaftedar

 *  @date	10 Aug 2010

 *  @version	1.0

 */

void WILC_Sleep(u32 u32TimeMilliSec)

{

	if (u32TimeMilliSec <= 4000000)	{

		u32 u32Temp = u32TimeMilliSec * 1000;

		usleep_range(u32Temp, u32Temp);

	} else {

		msleep(u32TimeMilliSec);

	}



}

drivers/staging/wilc1000/wilc_sleep.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#ifndef __WILC_SLEEP_H__

#define __WILC_SLEEP_H__



#include <linux/types.h>

#include <linux/delay.h>



/*!

 *  @brief	forces the current thread to sleep until the given time has elapsed

 *  @param[in]	u32TimeMilliSec Time to sleep in Milli seconds

 *  @sa		WILC_SleepMicrosec

 *  @author	syounan

 *  @date	10 Aug 2010

 *  @version	1.0

 *  @note	This function offers a relatively innacurate and low resolution

 *              sleep, for accurate high resolution sleep use u32TimeMicoSec

 */

/* TODO: remove and open-code in callers */

void WILC_Sleep(u32 u32TimeMilliSec);



#endif