summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/wilc1000/wilc_msgqueue.c10
-rw-r--r--drivers/staging/wilc1000/wilc_msgqueue.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index 907bae1..b996c47 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -14,7 +14,7 @@
int wilc_mq_create(struct message_queue *pHandle)
{
spin_lock_init(&pHandle->strCriticalSection);
- sema_init(&pHandle->hSem, 0);
+ sema_init(&pHandle->sem, 0);
pHandle->pstrMessageList = NULL;
pHandle->u32ReceiversCount = 0;
pHandle->bExiting = false;
@@ -33,7 +33,7 @@ int wilc_mq_destroy(struct message_queue *pHandle)
/* Release any waiting receiver thread. */
while (pHandle->u32ReceiversCount > 0) {
- up(&pHandle->hSem);
+ up(&pHandle->sem);
pHandle->u32ReceiversCount--;
}
@@ -99,7 +99,7 @@ int wilc_mq_send(struct message_queue *pHandle,
spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);
- up(&pHandle->hSem);
+ up(&pHandle->sem);
return 0;
}
@@ -132,7 +132,7 @@ int wilc_mq_recv(struct message_queue *pHandle,
pHandle->u32ReceiversCount++;
spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);
- down(&pHandle->hSem);
+ down(&pHandle->sem);
spin_lock_irqsave(&pHandle->strCriticalSection, flags);
pstrMessage = pHandle->pstrMessageList;
@@ -144,7 +144,7 @@ int wilc_mq_recv(struct message_queue *pHandle,
/* check buffer size */
if (u32RecvBufferSize < pstrMessage->len) {
spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);
- up(&pHandle->hSem);
+ up(&pHandle->sem);
PRINT_ER("u32RecvBufferSize overflow\n");
return -EOVERFLOW;
}
diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h
index 111be46..3ea4068 100644
--- a/drivers/staging/wilc1000/wilc_msgqueue.h
+++ b/drivers/staging/wilc1000/wilc_msgqueue.h
@@ -20,7 +20,7 @@ struct message {
};
struct message_queue {
- struct semaphore hSem;
+ struct semaphore sem;
spinlock_t strCriticalSection;
bool bExiting;
u32 u32ReceiversCount;