Skip to content

Commit

Permalink
staging: rtl8188eu: Remove rtw_is_list_empty(), wrapper for list_emty()
Browse files Browse the repository at this point in the history 
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
navin patidar authored and Greg Kroah-Hartman committed Jun 27, 2014
1 parent 8466070 commit 9c4b0e7
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 32 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/core/rtw_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)


spin_lock_irqsave(&queue->lock, irqL);
if (rtw_is_list_empty(&(queue->queue))) {
if (list_empty(&(queue->queue))) {
obj = NULL;
} else {
obj = container_of((&queue->queue)->next, struct cmd_obj, list);
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)
pstat->auth_seq = 0;
} else {
spin_lock_bh(&pstapriv->asoc_list_lock);
if (!rtw_is_list_empty(&pstat->asoc_list)) {
if (!list_empty(&pstat->asoc_list)) {
rtw_list_delete(&pstat->asoc_list);
pstapriv->asoc_list_cnt--;
}
Expand All @@ -829,7 +829,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)
}

spin_lock_bh(&pstapriv->auth_list_lock);
if (rtw_is_list_empty(&pstat->auth_list)) {
if (list_empty(&pstat->auth_list)) {
list_add_tail(&pstat->auth_list, &pstapriv->auth_list);
pstapriv->auth_list_cnt++;
}
Expand Down Expand Up @@ -1407,14 +1407,14 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame
pstat->state |= WIFI_FW_ASSOC_SUCCESS;

spin_lock_bh(&pstapriv->auth_list_lock);
if (!rtw_is_list_empty(&pstat->auth_list)) {
if (!list_empty(&pstat->auth_list)) {
rtw_list_delete(&pstat->auth_list);
pstapriv->auth_list_cnt--;
}
spin_unlock_bh(&pstapriv->auth_list_lock);

spin_lock_bh(&pstapriv->asoc_list_lock);
if (rtw_is_list_empty(&pstat->asoc_list)) {
if (list_empty(&pstat->asoc_list)) {
pstat->expire_to = pstapriv->expire_to;
list_add_tail(&pstat->asoc_list, &pstapriv->asoc_list);
pstapriv->asoc_list_cnt++;
Expand Down Expand Up @@ -1600,7 +1600,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
u8 updated = 0;

spin_lock_bh(&pstapriv->asoc_list_lock);
if (!rtw_is_list_empty(&psta->asoc_list)) {
if (!list_empty(&psta->asoc_list)) {
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
updated = ap_free_sta(padapter, psta, false, reason);
Expand Down Expand Up @@ -1664,7 +1664,7 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
u8 updated = 0;

spin_lock_bh(&pstapriv->asoc_list_lock);
if (!rtw_is_list_empty(&psta->asoc_list)) {
if (!list_empty(&psta->asoc_list)) {
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
updated = ap_free_sta(padapter, psta, false, reason);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/rtl8188eu/core/rtw_recv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor

/* Handling some condition for forced indicate case. */
if (bforced) {
if (rtw_is_list_empty(phead))
if (list_empty(phead))
return true;

prhdr = container_of(plist, struct recv_frame, list);
Expand All @@ -1820,7 +1820,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor

/* Prepare indication list and indication. */
/* Check if there is any packet need indicate. */
while (!rtw_is_list_empty(phead)) {
while (!list_empty(phead)) {
prhdr = container_of(plist, struct recv_frame, list);
prframe = (struct recv_frame *)prhdr;
pattrib = &prframe->attrib;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
phead = get_list_head(ppending_recvframe_queue);
plist = phead->next;

while (!rtw_is_list_empty(phead)) {
while (!list_empty(phead)) {
prhdr = container_of(plist, struct recv_frame, list);
prframe = (struct recv_frame *)prhdr;

Expand All @@ -382,7 +382,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
#ifdef CONFIG_88EU_AP_MODE

spin_lock_bh(&pstapriv->auth_list_lock);
if (!rtw_is_list_empty(&psta->auth_list)) {
if (!list_empty(&psta->auth_list)) {
rtw_list_delete(&psta->auth_list);
pstapriv->auth_list_cnt--;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/core/rtw_xmit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)

ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index));

if (rtw_is_list_empty(&ptxservq->tx_pending))
if (list_empty(&ptxservq->tx_pending))
list_add_tail(&ptxservq->tx_pending, get_list_head(phwxmits[ac_index].sta_queue));

list_add_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending));
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rtl8188eu/include/osdep_service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ void *rtw_malloc2d(int h, int w, int size);
void _rtw_memcpy(void *dec, void *sour, u32 sz);

void _rtw_init_listhead(struct list_head *list);
u32 rtw_is_list_empty(struct list_head *phead);
void rtw_list_delete(struct list_head *plist);

u32 _rtw_down_sema(struct semaphore *sema);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5176,7 +5176,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
psta = rtw_get_stainfo(pstapriv, param->sta_addr);
if (psta) {
spin_lock_bh(&pstapriv->asoc_list_lock);
if (!rtw_is_list_empty(&psta->asoc_list)) {
if (!list_empty(&psta->asoc_list)) {
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING);
Expand Down
19 changes: 1 addition & 18 deletions drivers/staging/rtl8188eu/os_dep/osdep_service.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,6 @@ void _rtw_init_listhead(struct list_head *list)
INIT_LIST_HEAD(list);
}

/*
For the following list_xxx operations,
caller must guarantee the atomic context.
Otherwise, there will be racing condition.
*/
u32 rtw_is_list_empty(struct list_head *phead)
{
if (list_empty(phead))
return true;
else
return false;
}

/*
Caller must check if the list is empty before calling rtw_list_delete
*/

u32 _rtw_down_sema(struct semaphore *sema)
{
if (down_interruptible(sema))
Expand All @@ -127,7 +110,7 @@ void _rtw_init_queue(struct __queue *pqueue)

u32 _rtw_queue_empty(struct __queue *pqueue)
{
return rtw_is_list_empty(&(pqueue->queue));
return list_empty(&(pqueue->queue));
}

inline u32 rtw_systime_to_ms(u32 systime)
Expand Down

0 comments on commit 9c4b0e7

Please sign in to comment.