mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: rtl8712: use list_first_entry_or_null() 

Use list_first_entry_or_null() instead of list_empty() + LIST_CONTAINOR()
to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geliang Tang 2016-02-01 22:47:03 +08:00 committed by Greg Kroah-Hartman
parent 97e2ba90fc
commit 818ff7b28b
5 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/rtl8712/rtl871x_cmd.c
View File

@ -136,15 +136,12 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue)
unsigned long irqL; unsigned long irqL;
struct cmd_obj *obj; struct cmd_obj *obj;
spin_lock_irqsave(&(queue->lock), irqL); spin_lock_irqsave(&queue->lock, irqL);
if (list_empty(&(queue->queue))) { obj = list_first_entry_or_null(&queue->queue,
obj = NULL; struct cmd_obj, list);
} else { if (obj)
obj = LIST_CONTAINOR(queue->queue.next,
struct cmd_obj, list);
list_del_init(&obj->list); list_del_init(&obj->list);
} spin_unlock_irqrestore(&queue->lock, irqL);
spin_unlock_irqrestore(&(queue->lock), irqL);
return obj; return obj;
} }

15
drivers/staging/rtl8712/rtl871x_mlme.c
View File

@ -87,16 +87,15 @@ struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv)
unsigned long irqL; unsigned long irqL;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
struct __queue *free_queue = &pmlmepriv->free_bss_pool; struct __queue *free_queue = &pmlmepriv->free_bss_pool;
struct list_head *plist = NULL;
if (list_empty(&free_queue->queue))
return NULL;
spin_lock_irqsave(&free_queue->lock, irqL); spin_lock_irqsave(&free_queue->lock, irqL);
plist = free_queue->queue.next; pnetwork = list_first_entry_or_null(&free_queue->queue,
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); struct wlan_network, list);
list_del_init(&pnetwork->list); if (pnetwork) {
pnetwork->last_scanned = jiffies; list_del_init(&pnetwork->list);
pmlmepriv->num_of_scanned++; pnetwork->last_scanned = jiffies;
pmlmepriv->num_of_scanned++;
}
spin_unlock_irqrestore(&free_queue->lock, irqL); spin_unlock_irqrestore(&free_queue->lock, irqL);
return pnetwork; return pnetwork;
} }

12
drivers/staging/rtl8712/rtl871x_recv.c
View File

@ -101,21 +101,17 @@ void _r8712_free_recv_priv(struct recv_priv *precvpriv)
r8712_free_recv_priv(precvpriv); r8712_free_recv_priv(precvpriv);
} }
union recv_frame *r8712_alloc_recvframe(struct __queue *pfree_recv_queue) union recv_frame *r8712_alloc_recvframe(struct __queue *pfree_recv_queue)
{ {
unsigned long irqL; unsigned long irqL;
union recv_frame *precvframe; union recv_frame *precvframe;
struct list_head *plist, *phead;
struct _adapter *padapter; struct _adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
spin_lock_irqsave(&pfree_recv_queue->lock, irqL); spin_lock_irqsave(&pfree_recv_queue->lock, irqL);
if (list_empty(&pfree_recv_queue->queue)) { precvframe = list_first_entry_or_null(&pfree_recv_queue->queue,
precvframe = NULL; union recv_frame, u.hdr.list);
} else { if (precvframe) {
phead = &pfree_recv_queue->queue;
plist = phead->next;
precvframe = LIST_CONTAINOR(plist, union recv_frame, u);
list_del_init(&precvframe->u.hdr.list); list_del_init(&precvframe->u.hdr.list);
padapter = precvframe->u.hdr.adapter; padapter = precvframe->u.hdr.adapter;
if (padapter != NULL) { if (padapter != NULL) {

16
drivers/staging/rtl8712/rtl871x_sta_mgt.c
View File

@ -111,13 +111,11 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
unsigned long flags; unsigned long flags;
pfree_sta_queue = &pstapriv->free_sta_queue; pfree_sta_queue = &pstapriv->free_sta_queue;
spin_lock_irqsave(&(pfree_sta_queue->lock), flags); spin_lock_irqsave(&pfree_sta_queue->lock, flags);
if (list_empty(&pfree_sta_queue->queue)) { psta = list_first_entry_or_null(&pfree_sta_queue->queue,
psta = NULL; struct sta_info, list);
} else { if (psta) {
psta = LIST_CONTAINOR(pfree_sta_queue->queue.next, list_del_init(&psta->list);
struct sta_info, list);
list_del_init(&(psta->list));
_init_stainfo(psta); _init_stainfo(psta);
memcpy(psta->hwaddr, hwaddr, ETH_ALEN); memcpy(psta->hwaddr, hwaddr, ETH_ALEN);
index = wifi_mac_hash(hwaddr); index = wifi_mac_hash(hwaddr);
@ -125,7 +123,7 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
psta = NULL; psta = NULL;
goto exit; goto exit;
} }
phash_list = &(pstapriv->sta_hash[index]); phash_list = &pstapriv->sta_hash[index];
list_add_tail(&psta->hash_list, phash_list); list_add_tail(&psta->hash_list, phash_list);
pstapriv->asoc_sta_count++; pstapriv->asoc_sta_count++;
@ -149,7 +147,7 @@ struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
} }
} }
exit: exit:
spin_unlock_irqrestore(&(pfree_sta_queue->lock), flags); spin_unlock_irqrestore(&pfree_sta_queue->lock, flags);
return psta; return psta;
} }

33
drivers/staging/rtl8712/rtl871x_xmit.c
View File

@ -741,21 +741,16 @@ void r8712_update_protection(struct _adapter *padapter, u8 *ie, uint ie_len)
struct xmit_buf *r8712_alloc_xmitbuf(struct xmit_priv *pxmitpriv) struct xmit_buf *r8712_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
{ {
unsigned long irqL; unsigned long irqL;
struct xmit_buf *pxmitbuf = NULL; struct xmit_buf *pxmitbuf;
struct list_head *plist, *phead;
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
spin_lock_irqsave(&pfree_xmitbuf_queue->lock, irqL); spin_lock_irqsave(&pfree_xmitbuf_queue->lock, irqL);
if (list_empty(&pfree_xmitbuf_queue->queue)) { pxmitbuf = list_first_entry_or_null(&pfree_xmitbuf_queue->queue,
pxmitbuf = NULL; struct xmit_buf, list);
} else { if (pxmitbuf) {
phead = &pfree_xmitbuf_queue->queue; list_del_init(&pxmitbuf->list);
plist = phead->next;
pxmitbuf = LIST_CONTAINOR(plist, struct xmit_buf, list);
list_del_init(&(pxmitbuf->list));
}
if (pxmitbuf != NULL)
pxmitpriv->free_xmitbuf_cnt--; pxmitpriv->free_xmitbuf_cnt--;
}
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irqL); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irqL);
return pxmitbuf; return pxmitbuf;
} }
@ -795,20 +790,14 @@ struct xmit_frame *r8712_alloc_xmitframe(struct xmit_priv *pxmitpriv)
pfree_xmit_queue pfree_xmit_queue
*/ */
unsigned long irqL; unsigned long irqL;
struct xmit_frame *pxframe = NULL; struct xmit_frame *pxframe;
struct list_head *plist, *phead;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
spin_lock_irqsave(&pfree_xmit_queue->lock, irqL); spin_lock_irqsave(&pfree_xmit_queue->lock, irqL);
if (list_empty(&pfree_xmit_queue->queue)) { pxframe = list_first_entry_or_null(&pfree_xmit_queue->queue,
pxframe = NULL; struct xmit_frame, list);
} else { if (pxframe) {
phead = &pfree_xmit_queue->queue; list_del_init(&pxframe->list);
plist = phead->next;
pxframe = LIST_CONTAINOR(plist, struct xmit_frame, list);
list_del_init(&(pxframe->list));
}
if (pxframe != NULL) {
pxmitpriv->free_xmitframe_cnt--; pxmitpriv->free_xmitframe_cnt--;
pxframe->buf_addr = NULL; pxframe->buf_addr = NULL;
pxframe->pxmitbuf = NULL; pxframe->pxmitbuf = NULL;