rtl8188eu: Remove wrapper around spin_unlock_irqrestore()

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2022-09-14 12:31:35 -05:00
parent 8f5cee5861
commit 7c6e80da34
4 changed files with 8 additions and 13 deletions

View file

@ -243,11 +243,6 @@ __inline static void _enter_critical_ex(_lock *plock, unsigned long *pirqL)
} }
#endif #endif
__inline static void _exit_critical_ex(_lock *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
__inline static void _enter_critical_bh(_lock *plock, unsigned long *pirqL) __inline static void _enter_critical_bh(_lock *plock, unsigned long *pirqL)
{ {
spin_lock_bh(plock); spin_lock_bh(plock);

View file

@ -11519,7 +11519,7 @@ void update_sta_info(_adapter *padapter, struct sta_info *psta)
_enter_critical_ex(&psta->lock, &irqL); _enter_critical_ex(&psta->lock, &irqL);
psta->state = _FW_LINKED; psta->state = _FW_LINKED;
_exit_critical_ex(&psta->lock, &irqL); spin_unlock_irqrestore(&psta->lock, irqL);
} }

View file

@ -387,7 +387,7 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
list_del_init(&precvbuf->list); list_del_init(&precvbuf->list);
list_add_tail(&precvbuf->list, get_list_head(queue)); list_add_tail(&precvbuf->list, get_list_head(queue));
_exit_critical_ex(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
return _SUCCESS; return _SUCCESS;
} }
@ -411,7 +411,7 @@ struct recv_buf *rtw_dequeue_recvbuf(_queue *queue)
list_del_init(&precvbuf->list); list_del_init(&precvbuf->list);
} }
_exit_critical_ex(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
return precvbuf; return precvbuf;
} }
@ -2637,7 +2637,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un
else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num)) { else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num)) {
/* Duplicate entry is found!! Do not insert current entry. */ /* Duplicate entry is found!! Do not insert current entry. */
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
return false; return false;
} else } else
@ -2656,7 +2656,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un
list_add_tail(&(prframe->u.hdr.list), plist); list_add_tail(&(prframe->u.hdr.list), plist);
/* spin_unlock(&ppending_recvframe_queue->lock); */ /* spin_unlock(&ppending_recvframe_queue->lock); */
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
return true; return true;
@ -2701,7 +2701,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
if (bforced) { if (bforced) {
pdbgpriv->dbg_rx_ampdu_forced_indicate_count++; pdbgpriv->dbg_rx_ampdu_forced_indicate_count++;
if (list_empty(phead)) { if (list_empty(phead)) {
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock); */
/* spin_unlock(&ppending_recvframe_queue->lock); */ /* spin_unlock(&ppending_recvframe_queue->lock); */
return true; return true;
} }

View file

@ -3269,7 +3269,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
if (_rtw_queue_empty(pframe_queue)) /* must be done after get_next and before break */ if (_rtw_queue_empty(pframe_queue)) /* must be done after get_next and before break */
list_del_init(&ptxservq->tx_pending); list_del_init(&ptxservq->tx_pending);
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */ /* spin_unlock_irqrestore(&phwxmit->sta_queue->lock, irqL0); */
goto exit; goto exit;
} }
@ -3278,7 +3278,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
} }
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */ /* rtw_xmit.c(&phwxmit->sta_queue->lock, irqL0); */
} }