summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_msgqueue.h
diff options
context:
space:
mode:
authorArnd Bergmann2015-06-01 21:06:36 +0200
committerGreg Kroah-Hartman2015-06-02 06:45:21 +0200
commit2ed3dc1d3ca0fcbf94ad087187e3d34e337ecf4d (patch)
treefcc3fd72f89ebdaa24cf0f187d0556f07a0fcdd9 /drivers/staging/wilc1000/wilc_msgqueue.h
parentstaging: wilc1000: remove unused string functions (diff)
downloadkernel-qcow2-linux-2ed3dc1d3ca0fcbf94ad087187e3d34e337ecf4d.tar.gz
kernel-qcow2-linux-2ed3dc1d3ca0fcbf94ad087187e3d34e337ecf4d.tar.xz
kernel-qcow2-linux-2ed3dc1d3ca0fcbf94ad087187e3d34e337ecf4d.zip
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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_msgqueue.h')
-rw-r--r--drivers/staging/wilc1000/wilc_msgqueue.h30
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h
index a48be533aad9..84157368335d 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.h
+++ b/drivers/staging/wilc1000/wilc_msgqueue.h
@@ -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,38 +18,12 @@
* @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
* CONFIG_WILC_MSG_QUEUE_IPC_NAME is enabled and pstrAttrs->pcName