Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 042f19c9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: clean up timer feature 



The driver has a simple wrapper around timer_list, and an
optional but unused feature to make the timer periodic.

This removes support for the periodic timer and simplifies
the code around timers.

A follow-up should replace the remaining wrapper with
open-coded timers.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b96ff76a

drivers/staging/wilc1000/wilc_osconfig.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
/* OS features supported */



/* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */

#define CONFIG_WILC_TIMER_FEATURE 1

/* #define CONFIG_WILC_TIMER_PERIODIC 1 */

/* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */

/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */

/* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */

drivers/staging/wilc1000/wilc_oswrapper.h

+0 −2
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ typedef WILC_Uint16 WILC_WideChar; 
#include "wilc_sleep.h"



/* Timer support */

#ifdef CONFIG_WILC_TIMER_FEATURE

#include "wilc_timer.h"

#endif



/* Memory support */

#include "wilc_memory.h"

drivers/staging/wilc1000/wilc_platform.h

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
 #endif*/





/* CONFIG_WILC_TIMER_FEATURE is implemented */



/* CONFIG_WILC_TIMER_PERIODIC is implemented */



/* remove the following block when implementing its feature */

#ifdef CONFIG_WILC_ASSERTION_SUPPORT

#error This feature is not supported by this OS

drivers/staging/wilc1000/wilc_timer.c

+0 −6
Original line number Diff line number Diff line 


#include "wilc_oswrapper.h"



#ifdef CONFIG_WILC_TIMER_FEATURE







WILC_ErrNo WILC_TimerCreate(WILC_TimerHandle *pHandle,

	tpfWILC_TimerFunction pfCallback, tstrWILC_TimerAttrs *pstrAttrs)

{
@@ -47,5 +43,3 @@ WILC_ErrNo WILC_TimerStop(WILC_TimerHandle *pHandle, 


	return s32RetStatus;

}
 


#endif

drivers/staging/wilc1000/wilc_timer.h

+0 −27
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
 *  @version	1.0

 */



#ifndef CONFIG_WILC_TIMER_FEATURE

#error the feature CONFIG_WILC_TIMER_FEATURE must be supported to include this file

#endif



typedef void (*tpfWILC_TimerFunction)(void *);



/*!
@@ -24,33 +20,10 @@ typedef void (*tpfWILC_TimerFunction)(void *); 
 *  @version		1.0

 */

typedef struct {

	/*!< if set to WILC_TRUE the callback function will be called

	 * periodically. */

	#ifdef CONFIG_WILC_TIMER_PERIODIC

	WILC_Bool bPeriodicTimer;

	#endif



	/* a dummy member to avoid compiler errors*/

	WILC_Uint8 dummy;

} tstrWILC_TimerAttrs;



/*!

 *  @brief	Fills the WILC_TimerAttrs with default parameters

 *  @param[out]	pstrAttrs structure to be filled

 *  @sa		WILC_TimerAttrs

 *  @author	syounan

 *  @date	16 Aug 2010

 *  @version	1.0

 */



static void WILC_TimerFillDefault(tstrWILC_TimerAttrs *pstrAttrs)

{

	#ifdef CONFIG_WILC_TIMER_PERIODIC

	pstrAttrs->bPeriodicTimer = WILC_FALSE;

	#endif

}





/*!

 *  @brief	Creates a new timer

 *  @details	Timers are a useful utility to execute some callback function