Commit 29197b7c authored by James A Shackleford's avatar James A Shackleford Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: remove wrapper function list_delete 



list_delete is just an inline wrapper around list_del_init.  This patch
removes the wrapper and directly uses list_del_init.

Signed-off-by: default avatarJames A Shackleford <shack@linux.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fdfbf789

drivers/staging/rtl8712/osdep_service.h

+0 −5
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ static inline struct list_head *get_list_head(struct __queue *queue) 
#define LIST_CONTAINOR(ptr, type, member) \

	((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))



static inline void list_delete(struct list_head *plist)

{

	list_del_init(plist);

}



static inline void _init_timer(struct timer_list *ptimer,

			       struct  net_device *padapter,

			       void *pfunc, void *cntx)

drivers/staging/rtl8712/rtl8712_recv.c

+4 −4
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int r8712_free_recvframe(union recv_frame *precvframe, 
		precvframe->u.hdr.pkt = NULL;

	}

	spin_lock_irqsave(&pfree_recv_queue->lock, irqL);

	list_delete(&(precvframe->u.hdr.list));

	list_del_init(&(precvframe->u.hdr.list));

	list_add_tail(&(precvframe->u.hdr.list),

			 get_list_head(pfree_recv_queue));

	if (padapter != NULL) {
@@ -211,7 +211,7 @@ static union recv_frame *recvframe_defrag(struct _adapter *adapter, 
	phead = get_list_head(defrag_q);

	plist = get_next(phead);

	prframe = LIST_CONTAINOR(plist, union recv_frame, u);

	list_delete(&prframe->u.list);

	list_del_init(&prframe->u.list);

	pfhdr = &prframe->u.hdr;

	curfragnum = 0;

	if (curfragnum != pfhdr->attrib.frag_num) {
@@ -511,7 +511,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, 
		else

			break;

	}

	list_delete(&(prframe->u.hdr.list));

	list_del_init(&(prframe->u.hdr.list));

	list_add_tail(&(prframe->u.hdr.list), plist);

	return true;

}
@@ -547,7 +547,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter, 
		pattrib = &prframe->u.hdr.attrib;

		if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) {

			plist = get_next(plist);

			list_delete(&(prframe->u.hdr.list));

			list_del_init(&(prframe->u.hdr.list));

			if (SN_EQUAL(preorder_ctrl->indicate_seq,

			    pattrib->seq_num))

				preorder_ctrl->indicate_seq =

drivers/staging/rtl8712/rtl8712_xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, 
	if ((end_of_queue_search(xmitframe_phead, xmitframe_plist)) == false) {

		pxmitframe = LIST_CONTAINOR(xmitframe_plist,

			     struct xmit_frame, list);

		list_delete(&pxmitframe->list);

		list_del_init(&pxmitframe->list);

		ptxservq->qcnt--;

		phwxmit->txcmdcnt++;

	}
@@ -226,7 +226,7 @@ static struct xmit_frame *dequeue_xframe_ex(struct xmit_priv *pxmitpriv, 
			/*Remove sta node when there are no pending packets.*/

			if (_queue_empty(pframe_queue)) {

				/*must be done after get_next and before break*/

				list_delete(&ptxservq->tx_pending);

				list_del_init(&ptxservq->tx_pending);

			}

		}

	}

drivers/staging/rtl8712/rtl871x_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue) 
	else {

		obj = LIST_CONTAINOR(get_next(&(queue->queue)),

				     struct cmd_obj, list);

		list_delete(&obj->list);

		list_del_init(&obj->list);

	}

	spin_unlock_irqrestore(&(queue->lock), irqL);

	return obj;

drivers/staging/rtl8712/rtl871x_mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv) 
	spin_lock_irqsave(&free_queue->lock, irqL);

	plist = get_next(&(free_queue->queue));

	pnetwork = LIST_CONTAINOR(plist , struct wlan_network, list);

	list_delete(&pnetwork->list);

	list_del_init(&pnetwork->list);

	pnetwork->last_scanned = jiffies;

	pmlmepriv->num_of_scanned++;

	spin_unlock_irqrestore(&free_queue->lock, irqL);
@@ -117,7 +117,7 @@ static void _free_network(struct mlme_priv *pmlmepriv, 
	if (delta_time < SCANQUEUE_LIFETIME)

		return;

	spin_lock_irqsave(&free_queue->lock, irqL);

	list_delete(&pnetwork->list);

	list_del_init(&pnetwork->list);

	list_add_tail(&pnetwork->list, &free_queue->queue);

	pmlmepriv->num_of_scanned--;

	spin_unlock_irqrestore(&free_queue->lock, irqL);
@@ -132,7 +132,7 @@ static void _free_network_nolock(struct mlme_priv *pmlmepriv, 
		return;

	if (pnetwork->fixed == true)

		return;

	list_delete(&pnetwork->list);

	list_del_init(&pnetwork->list);

	list_add_tail(&pnetwork->list, get_list_head(free_queue));

	pmlmepriv->num_of_scanned--;

}