diff --git a/osdep_service_linux.h b/osdep_service_linux.h
index 400af47..220c370 100644
--- a/osdep_service_linux.h
+++ b/osdep_service_linux.h
@@ -243,11 +243,6 @@ __inline static void _enter_critical_ex(_lock *plock, unsigned long *pirqL)
 }
 
 #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)
 {
 	spin_lock_bh(plock);
diff --git a/rtw_mlme_ext.c b/rtw_mlme_ext.c
index 2e9878e..31a2f16 100755
--- a/rtw_mlme_ext.c
+++ b/rtw_mlme_ext.c
@@ -11519,7 +11519,7 @@ void update_sta_info(_adapter *padapter, struct sta_info *psta)
 
 	_enter_critical_ex(&psta->lock, &irqL);
 	psta->state = _FW_LINKED;
-	_exit_critical_ex(&psta->lock, &irqL);
+	spin_unlock_irqrestore(&psta->lock, irqL);
 
 }
 
diff --git a/rtw_recv.c b/rtw_recv.c
index 3150739..9439415 100755
--- a/rtw_recv.c
+++ b/rtw_recv.c
@@ -387,7 +387,7 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
 	list_del_init(&precvbuf->list);
 
 	list_add_tail(&precvbuf->list, get_list_head(queue));
-	_exit_critical_ex(&queue->lock, &irqL);
+	spin_unlock_irqrestore(&queue->lock, irqL);
 	return _SUCCESS;
 }
 
@@ -411,7 +411,7 @@ struct recv_buf *rtw_dequeue_recvbuf(_queue *queue)
 		list_del_init(&precvbuf->list);
 	}
 
-	_exit_critical_ex(&queue->lock, &irqL);
+	spin_unlock_irqrestore(&queue->lock, irqL);
 
 	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)) {
 			/* 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;
 		} 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);
 
 	/* spin_unlock(&ppending_recvframe_queue->lock); */
-	/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */
+	/* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
 
 
 	return true;
@@ -2701,7 +2701,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
 	if (bforced) {
 		pdbgpriv->dbg_rx_ampdu_forced_indicate_count++;
 		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); */
 			return true;
 		}
diff --git a/rtw_xmit.c b/rtw_xmit.c
index 1e91874..6c1aa77 100644
--- a/rtw_xmit.c
+++ b/rtw_xmit.c
@@ -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 */
 					list_del_init(&ptxservq->tx_pending);
 
-				/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
+				/* spin_unlock_irqrestore(&phwxmit->sta_queue->lock, irqL0); */
 
 				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); */
 
 	}