staging: rtl8712: remove wrapper function _queue_empty

_queue_empty is an inline wrapper around list_empty.  This patch removes this
wrapper function and instead calls list_empty directly.

Signed-off-by: James A Shackleford <shack@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index dc6cde9..f534ec2 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -108,11 +108,6 @@ static inline u32 _down_sema(struct semaphore *sema)
                return _SUCCESS;
 }
 
-static inline u32 _queue_empty(struct  __queue *pqueue)
-{
-       return list_empty(&(pqueue->queue));
-}
-
 static inline u32 end_of_queue_search(struct list_head *head,
                struct list_head *plist)
 {

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 4998fde..6151977 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -410,7 +410,7 @@ _next:
                                }
                        }
                        r8712_free_cmd_obj(pcmd);
-                       if (_queue_empty(&(pcmdpriv->cmd_queue))) {
+                       if (list_empty(&pcmdpriv->cmd_queue.queue)) {
                                r8712_unregister_cmd_alive(padapter);
                                continue;
                        } else

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index 3a057e2..df1e498 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -288,7 +288,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter,
                if (pdefrag_q != NULL) {
                        if (fragnum == 0) {
                                /*the first fragment*/
-                               if (_queue_empty(pdefrag_q) == false) {
+                               if (!list_empty(&pdefrag_q->queue)) {
                                        /*free current defrag_q */
                                        r8712_free_recvframe_queue(pdefrag_q,
                                                             pfree_recv_queue);

diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index f3d2998..4ebedb4 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -224,7 +224,7 @@ static struct xmit_frame *dequeue_xframe_ex(struct xmit_priv *pxmitpriv,
                        }
                        sta_plist = sta_plist->next;
                        /*Remove sta node when there are no pending packets.*/
-                       if (_queue_empty(pframe_queue)) {
+                       if (list_empty(&pframe_queue->queue)) {
                                /* must be done after sta_plist->next
                                 * and before break
                                 */

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 226f247..9d47eb4 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -71,7 +71,7 @@ static u8 do_join(struct _adapter *padapter)
 
        /* adhoc mode will start with an empty queue, but skip checking */
        if (!check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) &&
-           _queue_empty(queue)) {
+           list_empty(&queue->queue)) {
                if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
                        pmlmepriv->fw_state ^= _FW_UNDER_LINKING;
                /* when set_ssid/set_bssid for do_join(), but scanning queue

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index d37ba7b..7b7fdec 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -89,7 +89,7 @@ struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv)
        struct  __queue *free_queue = &pmlmepriv->free_bss_pool;
        struct list_head *plist = NULL;
 
-       if (_queue_empty(free_queue) == true)
+       if (list_empty(&free_queue->queue))
                return NULL;
        spin_lock_irqsave(&free_queue->lock, irqL);
        plist = free_queue->queue.next;
@@ -420,7 +420,7 @@ static void update_scanned_network(struct _adapter *adapter,
        /* If we didn't find a match, then get a new network slot to initialize
         * with this beacon's information */
        if (end_of_queue_search(phead, plist) == true) {
-               if (_queue_empty(&pmlmepriv->free_bss_pool) == true) {
+               if (list_empty(&pmlmepriv->free_bss_pool.queue)) {
                        /* If there are no more slots, expire the oldest */
                        pnetwork = oldest;
                        target->Rssi = (pnetwork->network.Rssi +

diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index cc2ca11..a3889d1 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -112,7 +112,7 @@ union recv_frame *r8712_alloc_recvframe(struct  __queue *pfree_recv_queue)
        struct recv_priv *precvpriv;
 
        spin_lock_irqsave(&pfree_recv_queue->lock, irqL);
-       if (_queue_empty(pfree_recv_queue) == true)
+       if (list_empty(&pfree_recv_queue->queue))
                precvframe = NULL;
        else {
                phead = &pfree_recv_queue->queue;

diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 73ca66e..e769bb5 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -121,7 +121,7 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
 
        pfree_sta_queue = &pstapriv->free_sta_queue;
        spin_lock_irqsave(&(pfree_sta_queue->lock), flags);
-       if (_queue_empty(pfree_sta_queue) == true)
+       if (list_empty(&pfree_sta_queue->queue))
                psta = NULL;
        else {
                psta = LIST_CONTAINOR(pfree_sta_queue->queue.next,

diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index 4b3fa40..a104b77 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -744,7 +744,7 @@ struct xmit_buf *r8712_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
        struct  __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
 
        spin_lock_irqsave(&pfree_xmitbuf_queue->lock, irqL);
-       if (_queue_empty(pfree_xmitbuf_queue) == true)
+       if (list_empty(&pfree_xmitbuf_queue->queue))
                pxmitbuf = NULL;
        else {
                phead = &pfree_xmitbuf_queue->queue;
@@ -798,7 +798,7 @@ struct xmit_frame *r8712_alloc_xmitframe(struct xmit_priv *pxmitpriv)
        struct  __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
 
        spin_lock_irqsave(&pfree_xmit_queue->lock, irqL);
-       if (_queue_empty(pfree_xmit_queue) == true)
+       if (list_empty(&pfree_xmit_queue->queue))
                pxframe =  NULL;
        else {
                phead = &pfree_xmit_queue->queue;