[PATCH v2 08/12] staging: wilc1000: remove unused OS abstraction features

[Arnd Bergmann <arnd@arndb.de>]

All the remaining features from the OS abstraction layer
are not used at all in the driver, so we can just remove
the remaining references to them.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/staging/wilc1000/wilc_errorsupport.h |  17 ----
 drivers/staging/wilc1000/wilc_event.h        | 123 ---------------------------
 drivers/staging/wilc1000/wilc_osconfig.h     |  14 ---
 drivers/staging/wilc1000/wilc_oswrapper.h    |  22 -----
 drivers/staging/wilc1000/wilc_platform.h     |  62 --------------
 5 files changed, 238 deletions(-)
 delete mode 100644 drivers/staging/wilc1000/wilc_event.h

diff --git a/drivers/staging/wilc1000/wilc_errorsupport.h b/drivers/staging/wilc1000/wilc_errorsupport.h
index 6405ef8ad431..4da657d17020 100644
--- a/drivers/staging/wilc1000/wilc_errorsupport.h
+++ b/drivers/staging/wilc1000/wilc_errorsupport.h
@@ -64,21 +64,4 @@ typedef WILC_Sint32 WILC_ErrNo;
 ERRORHANDLER: \
 	if (WILC_IS_ERR(__status__)) \
 
-#ifdef CONFIG_WILC_ASSERTION_SUPPORT
-
-/**
- * @brief	prints a diagnostic message and aborts the program
- * @param[in]   pcExpression The expression that triggered the assertion
- * @param[in]   pcFileName The name of the current source file.
- * @param[in]   u32LineNumber The line number in the current source file.
- * @warning DO NOT CALL DIRECTLY. USE EQUIVALENT MACRO FUNCTION INSTEAD.
- */
-void WILC_assert_INTERNAL(WILC_Char *pcExpression, WILC_Char *pcFileName, WILC_Uint32 u32LineNumber);
-
-#define WILC_assert(__expression__) (void)(!!(__expression__) || (WILC_assert_INTERNAL((# __expression__), __WILC_FILE__, __WILC_LINE__), 0))
-
-#else
-#define WILC_assert(__expression__) ((void)0)
-#endif
-
 #endif
diff --git a/drivers/staging/wilc1000/wilc_event.h b/drivers/staging/wilc1000/wilc_event.h
deleted file mode 100644
index 94e0f7c0bed5..000000000000
--- a/drivers/staging/wilc1000/wilc_event.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef __WILC_EVENT_H__
-#define __WILC_EVENT_H__
-
-/*!
- *  @file	wilc_event.h
- *  @brief	Event OS wrapper functionality
- *  @author	syounan
- *  @sa		wilc_oswrapper.h top level OS wrapper file
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-
-#ifndef CONFIG_WILC_EVENT_FEATURE
-#error the feature CONFIG_WILC_EVENT_FEATURE must be supported to include this file
-#endif
-
-
-/*!
- *  @struct             tstrWILC_TimerAttrs
- *  @brief		Timer API options
- *  @author		syounan
- *  @date		10 Oct 2010
- *  @version		1.0
- */
-typedef struct {
-	/* a dummy member to avoid compiler errors*/
-	WILC_Uint8 dummy;
-
-	#ifdef CONFIG_WILC_EVENT_TIMEOUT
-	/*!<
-	 * Timeout for use with WILC_EventWait, 0 to return immediately and
-	 * WILC_OS_INFINITY to wait forever. default is WILC_OS_INFINITY
-	 */
-	WILC_Uint32 u32TimeOut;
-	#endif
-
-} tstrWILC_EventAttrs;
-
-/*!
- *  @brief	Fills the WILC_TimerAttrs with default parameters
- *  @param[out]	pstrAttrs structure to be filled
- *  @sa		WILC_TimerAttrs
- *  @author	syounan
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-static void WILC_EventFillDefault(tstrWILC_EventAttrs *pstrAttrs)
-{
-	#ifdef CONFIG_WILC_EVENT_TIMEOUT
-	pstrAttrs->u32TimeOut = WILC_OS_INFINITY;
-	#endif
-}
-
-/*!
- *  @brief	Creates a new Event
- *  @details	the Event is an object that allows a thread to wait until an external
- *                      event occuers, Event objects have 2 states, either TRIGGERED or
- *                      UNTRIGGERED
- *  @param[out]	pHandle handle to the newly created event object
- *  @param[in]	pstrAttrs Optional attributes, NULL for default
- *  @return	Error code indicating sucess/failure
- *  @sa		tstrWILC_EventAttrs
- *  @author	syounan
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-WILC_ErrNo WILC_EventCreate(WILC_EventHandle *pHandle, tstrWILC_EventAttrs *pstrAttrs);
-
-
-/*!
- *  @brief	Destroys a given event
- *  @details	This will destroy a given event freeing any resources used by it
- *              if there are any thread blocked by the WILC_EventWait call the the
- *              behaviour is undefined
- *  @param[in]	pHandle handle to the event object
- *  @param[in]	pstrAttrs Optional attributes, NULL for default
- *  @return	Error code indicating sucess/failure
- *  @sa		tstrWILC_EventAttrs
- *  @author	syounan
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-WILC_ErrNo WILC_EventDestroy(WILC_EventHandle *pHandle,
-			     tstrWILC_EventAttrs *pstrAttrs);
-
-/*!
- *  @brief	Triggers a given event
- *  @details	This function will set the given event into the TRIGGERED state,
- *                      if the event is already in TRIGGERED, this function will have no
- *                      effect
- *  @param[in]	pHandle handle to the event object
- *  @param[in]	pstrAttrs Optional attributes, NULL for default
- *  @return	Error code indicating sucess/failure
- *  @sa		tstrWILC_EventAttrs
- *  @author	syounan
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-WILC_ErrNo WILC_EventTrigger(WILC_EventHandle *pHandle,
-			     tstrWILC_EventAttrs *pstrAttrs);
-
-
-/*!
- *  @brief	waits until a given event is triggered
- *  @details	This function will block the calling thread until the event becomes
- *                      in the TRIGGERED state. the call will retun the event into the
- *                      UNTRIGGERED	state upon completion
- *                      if multible threads are waiting on the same event at the same time,
- *                      behaviour is undefined
- *  @param[in]	pHandle handle to the event object
- *  @param[in]	pstrAttrs Optional attributes, NULL for default
- *  @return	Error code indicating sucess/failure
- *  @sa		tstrWILC_EventAttrs
- *  @author	syounan
- *  @date	10 Oct 2010
- *  @version	1.0
- */
-WILC_ErrNo WILC_EventWait(WILC_EventHandle *pHandle,
-			  tstrWILC_EventAttrs *pstrAttrs);
-
-
-
-#endif
\ No newline at end of file
diff --git a/drivers/staging/wilc1000/wilc_osconfig.h b/drivers/staging/wilc1000/wilc_osconfig.h
index 639160d1fa4e..f9c25140393e 100644
--- a/drivers/staging/wilc1000/wilc_osconfig.h
+++ b/drivers/staging/wilc1000/wilc_osconfig.h
@@ -7,17 +7,3 @@
 #define WILC_LOGS_ALL              5
 
 #define WILC_LOG_VERBOSITY_LEVEL WILC_LOGS_ALL
-
-/* OS features supported */
-
-/* #define CONFIG_WILC_SEMAPHORE_TIMEOUT 1 */
-/* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */
-/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */
-/* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */
-/* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */
-/* #define CONFIG_WILC_EVENT_FEATURE */
-/* #define CONFIG_WILC_EVENT_TIMEOUT */
-/* #define CONFIG_WILC_SOCKET_FEATURE */
-/* #define CONFIG_WILC_MATH_OPERATIONS_FEATURE */
-/* #define CONFIG_WILC_EXTENDED_FILE_OPERATIONS */
-/* #define CONFIG_WILC_EXTENDED_TIME_OPERATIONS */
diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h
index be6393cba8c2..1999970635aa 100644
--- a/drivers/staging/wilc1000/wilc_oswrapper.h
+++ b/drivers/staging/wilc1000/wilc_oswrapper.h
@@ -72,26 +72,4 @@ typedef WILC_Uint16 WILC_WideChar;
 /* Message Queue */
 #include "wilc_msgqueue.h"
 
-/* File operations */
-#ifdef CONFIG_WILC_FILE_OPERATIONS_FEATURE
-#include "wilc_fileops.h"
-#endif
-
-/* Event support */
-#ifdef CONFIG_WILC_EVENT_FEATURE
-#include "wilc_event.h"
-#endif
-
-/* Socket operations */
-#ifdef CONFIG_WILC_SOCKET_FEATURE
-#include "wilc_socket.h"
-#endif
-
-/* Math operations */
-#ifdef CONFIG_WILC_MATH_OPERATIONS_FEATURE
-#include "wilc_math.h"
-#endif
-
-
-
 #endif
diff --git a/drivers/staging/wilc1000/wilc_platform.h b/drivers/staging/wilc1000/wilc_platform.h
index d3f8fc6f2971..2e0f41735df0 100644
--- a/drivers/staging/wilc1000/wilc_platform.h
+++ b/drivers/staging/wilc1000/wilc_platform.h
@@ -1,68 +1,6 @@
 #ifndef __WILC_platfrom_H__
 #define __WILC_platfrom_H__
 
-/*!
- *  @file	wilc_platform.h
- *  @brief	platform specific file for Linux port
- *  @author	syounan
- *  @sa		wilc_oswrapper.h top level OS wrapper file
- *  @date	15 Dec 2010
- *  @version	1.0
- */
-
-
-/******************************************************************
- *      Feature support checks
- *******************************************************************/
-
-/* CONFIG_WILC_SEMAPHORE_FEATURE is implemented */
-
-/* remove the following block when implementing its feature
- * #ifdef CONFIG_WILC_SEMAPHORE_TIMEOUT
- * #error This feature is not supported by this OS
- #endif*/
-
-
-/* remove the following block when implementing its feature */
-#ifdef CONFIG_WILC_ASSERTION_SUPPORT
-#error This feature is not supported by this OS
-#endif
-
-/* CONFIG_WILC_FILE_OPERATIONS_FEATURE is implemented */
-
-/* CONFIG_WILC_FILE_OPERATIONS_STRING_API is implemented */
-
-/* remove the following block when implementing its feature */
-#ifdef CONFIG_WILC_FILE_OPERATIONS_PATH_API
-#error This feature is not supported by this OS
-#endif
-
-/* remove the following block when implementing its feature */
-#ifdef CONFIG_WILC_EVENT_FEATURE
-#error This feature is not supported by this OS
-#endif
-
-/* remove the following block when implementing its feature */
-#ifdef CONFIG_WILC_EVENT_TIMEOUT
-#error This feature is not supported by this OS
-#endif
-
-/* CONFIG_WILC_MATH_OPERATIONS_FEATURE is implemented */
-
-/* CONFIG_WILC_EXTENDED_FILE_OPERATIONS is implemented */
-
-/* CONFIG_WILC_EXTENDED_TIME_OPERATIONS is implemented */
-
-/* remove the following block when implementing its feature */
-#ifdef CONFIG_WILC_SOCKET_FEATURE
-#error This feature is not supported by this OS
-#endif
-
-/******************************************************************
- *      OS specific includes
- *******************************************************************/
-#define _XOPEN_SOURCE 600
-
 #include <linux/kthread.h>
 #include <linux/semaphore.h>
 #include <linux/module.h>
-- 
2.1.0.rc2