From 9672b1bd831b12869aaa1ae0ede0e45cd18c5272 Mon Sep 17 00:00:00 2001 From: James A Shackleford Date: Tue, 24 Jun 2014 22:52:35 -0400 Subject: [PATCH] staging: rtl8712: remove wrapper function is_list_empty is_list_empty is just an inline wrapper around list_empty. This patch removes the wrapper and directly uses list_empty instead. Signed-off-by: James A Shackleford Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/osdep_service.h | 10 +--------- drivers/staging/rtl8712/rtl8712_recv.c | 4 ++-- drivers/staging/rtl8712/rtl871x_cmd.c | 2 +- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 81f48a60646d..3857cc0b6b75 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -115,14 +115,6 @@ For the following list_xxx operations, caller must guarantee the atomic context. Otherwise, there will be racing condition. */ -static inline u32 is_list_empty(struct list_head *phead) -{ - if (list_empty(phead)) - return true; - else - return false; -} - static inline void list_insert_tail(struct list_head *plist, struct list_head *phead) { @@ -139,7 +131,7 @@ static inline u32 _down_sema(struct semaphore *sema) static inline u32 _queue_empty(struct __queue *pqueue) { - return is_list_empty(&(pqueue->queue)); + return list_empty(&(pqueue->queue)); } static inline u32 end_of_queue_search(struct list_head *head, diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c index e311a601a4fd..ef22802a73f9 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.c +++ b/drivers/staging/rtl8712/rtl8712_recv.c @@ -532,7 +532,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, plist = get_next(phead); /* Handling some condition for forced indicate case.*/ if (bforced == true) { - if (is_list_empty(phead)) + if (list_empty(phead)) return true; else { prframe = LIST_CONTAINOR(plist, union recv_frame, u); @@ -542,7 +542,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, } /* Prepare indication list and indication. * Check if there is any packet need indicate. */ - while (!is_list_empty(phead)) { + while (!list_empty(phead)) { prframe = LIST_CONTAINOR(plist, union recv_frame, u); pattrib = &prframe->u.hdr.attrib; if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) { diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index 646c5cd5245d..689364dfa564 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -137,7 +137,7 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue) struct cmd_obj *obj; spin_lock_irqsave(&(queue->lock), irqL); - if (is_list_empty(&(queue->queue))) + if (list_empty(&(queue->queue))) obj = NULL; else { obj = LIST_CONTAINOR(get_next(&(queue->queue)), diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index 68bfab0f7dd1..989fb67dfb51 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -939,7 +939,7 @@ sint r8712_xmit_classifier(struct _adapter *padapter, ptxservq = get_sta_pending(padapter, &pstapending, psta, pattrib->priority); spin_lock_irqsave(&pstapending->lock, irqL0); - if (is_list_empty(&ptxservq->tx_pending)) + if (list_empty(&ptxservq->tx_pending)) list_insert_tail(&ptxservq->tx_pending, get_list_head(pstapending)); list_insert_tail(&pxmitframe->list,