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

Commit 2ed3dc1d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: simplify msgqueue code 



The driver contains an abstraction for message queues, with
optional unused features, while the driver requires the main
feature.

This makes the msgqueue code unconditional as it's required
but removes the unused parts.

A later cleanup should remove the entire msgqueue code
and replace it with some normal kernel API.

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

drivers/staging/wilc1000/wilc_msgqueue.c

+0 −9
Original line number Diff line number Diff line 


#include "wilc_oswrapper.h"

#include <linux/spinlock.h>

#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE





/*!

 *  @author		syounan
@@ -154,11 +152,6 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, 
	spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);



	WILC_SemaphoreFillDefault(&strSemAttrs);

	#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT

	if (pstrAttrs != WILC_NULL) {

		strSemAttrs.u32TimeOut = pstrAttrs->u32Timeout;

	}

	#endif

	s32RetStatus = WILC_SemaphoreAcquire(&(pHandle->hSem), &strSemAttrs);

	if (s32RetStatus == WILC_TIMEOUT) {

		/* timed out, just exit without consumeing the message */
@@ -207,5 +200,3 @@ WILC_ErrNo WILC_MsgQueueRecv(WILC_MsgQueueHandle *pHandle, 


	return s32RetStatus;

}
 


#endif

drivers/staging/wilc1000/wilc_msgqueue.h

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

 */



#ifndef CONFIG_WILC_MSG_QUEUE_FEATURE

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

#endif



/*!

 *  @struct             tstrWILC_MsgQueueAttrs

 *  @brief		Message Queue API options
@@ -22,37 +18,11 @@ 
 *  @version		1.0

 */

typedef struct {

	#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME

	WILC_Char *pcName;

	#endif



	#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT

	WILC_Uint32 u32Timeout;

	#endif



	/* a dummy member to avoid compiler errors*/

	WILC_Uint8 dummy;



} tstrWILC_MsgQueueAttrs;



/*!

 *  @brief		Fills the MsgQueueAttrs with default parameters

 *  @param[out]	pstrAttrs structure to be filled

 *  @sa			WILC_TimerAttrs

 *  @author		syounan

 *  @date		30 Aug 2010

 *  @version		1.0

 */

static void WILC_MsgQueueFillDefault(tstrWILC_MsgQueueAttrs *pstrAttrs)

{

	#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME

	pstrAttrs->pcName = WILC_NULL;

	#endif



	#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT

	pstrAttrs->u32Timeout = WILC_OS_INFINITY;

	#endif

}

/*!

 *  @brief		Creates a new Message queue

 *  @details		Creates a new Message queue, if the feature

drivers/staging/wilc1000/wilc_osconfig.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
/* #define CONFIG_WILC_MEMORY_POOLS 1 */

/* #define CONFIG_WILC_MEMORY_DEBUG 1 */

/* #define CONFIG_WILC_ASSERTION_SUPPORT 1 */

#define CONFIG_WILC_MSG_QUEUE_FEATURE

/* #define CONFIG_WILC_MSG_QUEUE_IPC_NAME */

/* #define CONFIG_WILC_MSG_QUEUE_TIMEOUT */

/* #define CONFIG_WILC_FILE_OPERATIONS_FEATURE */

/* #define CONFIG_WILC_FILE_OPERATIONS_STRING_API */

/* #define CONFIG_WILC_FILE_OPERATIONS_PATH_API */

drivers/staging/wilc1000/wilc_oswrapper.h

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



/* Message Queue */

#ifdef CONFIG_WILC_MSG_QUEUE_FEATURE

#include "wilc_msgqueue.h"

#endif



/* File operations */

#ifdef CONFIG_WILC_FILE_OPERATIONS_FEATURE

drivers/staging/wilc1000/wilc_platform.h

+0 −12
Original line number Diff line number Diff line
@@ -50,18 +50,6 @@ 
#error This feature is not supported by this OS

#endif



/* CONFIG_WILC_MSG_QUEUE_FEATURE is implemented */



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

#ifdef CONFIG_WILC_MSG_QUEUE_IPC_NAME

#error This feature is not supported by this OS

#endif



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

/*#ifdef CONFIG_WILC_MSG_QUEUE_TIMEOUT

 * #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 */