Commit 597794f5 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman

staging: r8188eu: Remove wrappers around spin_unlock_irqrestore

Again there are two - _exit_critical() and _exit_critical_ex().
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f937886b
...@@ -157,7 +157,7 @@ _func_enter_; ...@@ -157,7 +157,7 @@ _func_enter_;
rtw_list_insert_tail(&obj->list, &queue->queue); rtw_list_insert_tail(&obj->list, &queue->queue);
_exit_critical(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
exit: exit:
...@@ -181,7 +181,7 @@ _func_enter_; ...@@ -181,7 +181,7 @@ _func_enter_;
rtw_list_delete(&obj->list); rtw_list_delete(&obj->list);
} }
_exit_critical(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
_func_exit_; _func_exit_;
......
...@@ -331,7 +331,7 @@ int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue) ...@@ -331,7 +331,7 @@ int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)
rtw_list_delete(&precvbuf->list); rtw_list_delete(&precvbuf->list);
rtw_list_insert_tail(&precvbuf->list, get_list_head(queue)); rtw_list_insert_tail(&precvbuf->list, get_list_head(queue));
_exit_critical_ex(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
return _SUCCESS; return _SUCCESS;
} }
...@@ -355,7 +355,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue) ...@@ -355,7 +355,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
rtw_list_delete(&precvbuf->list); rtw_list_delete(&precvbuf->list);
} }
_exit_critical_ex(&queue->lock, &irqL); spin_unlock_irqrestore(&queue->lock, irqL);
return precvbuf; return precvbuf;
} }
......
...@@ -1299,7 +1299,7 @@ _func_enter_; ...@@ -1299,7 +1299,7 @@ _func_enter_;
} }
} }
_exit_critical(&pfree_queue->lock, &irql); spin_unlock_irqrestore(&pfree_queue->lock, irql);
_func_exit_; _func_exit_;
...@@ -1323,7 +1323,7 @@ _func_enter_; ...@@ -1323,7 +1323,7 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue));
pxmitpriv->free_xmit_extbuf_cnt++; pxmitpriv->free_xmit_extbuf_cnt++;
_exit_critical(&pfree_queue->lock, &irql); spin_unlock_irqrestore(&pfree_queue->lock, irql);
_func_exit_; _func_exit_;
...@@ -1363,7 +1363,7 @@ _func_enter_; ...@@ -1363,7 +1363,7 @@ _func_enter_;
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
} }
} }
_exit_critical(&pfree_xmitbuf_queue->lock, &irql); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irql);
_func_exit_; _func_exit_;
...@@ -1394,7 +1394,7 @@ _func_enter_; ...@@ -1394,7 +1394,7 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue));
pxmitpriv->free_xmitbuf_cnt++; pxmitpriv->free_xmitbuf_cnt++;
_exit_critical(&pfree_xmitbuf_queue->lock, &irql); spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, irql);
} }
_func_exit_; _func_exit_;
......
...@@ -76,16 +76,6 @@ static inline struct list_head *get_list_head(struct __queue *queue) ...@@ -76,16 +76,6 @@ static inline struct list_head *get_list_head(struct __queue *queue)
#define LIST_CONTAINOR(ptr, type, member) \ #define LIST_CONTAINOR(ptr, type, member) \
((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member)))
static inline void _exit_critical(spinlock_t *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
static inline void _exit_critical_ex(spinlock_t *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
static inline int _enter_critical_mutex(struct mutex *pmutex, static inline int _enter_critical_mutex(struct mutex *pmutex,
unsigned long *pirqL) unsigned long *pirqL)
{ {
......
...@@ -213,7 +213,7 @@ _func_enter_; ...@@ -213,7 +213,7 @@ _func_enter_;
break; break;
} }
_exit_critical(&pxmitpriv->lock, &irqL); spin_unlock_irqrestore(&pxmitpriv->lock, irqL);
purb = pxmitbuf->pxmit_urb[0]; purb = pxmitbuf->pxmit_urb[0];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment