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

staging: rtl8712: remove wrapper function list_insert_tail 



list_insert_tail is just an inline wrapper around list_add_tail.  This
patch removes the wrapper and directly uses list_add_tail.

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

drivers/staging/rtl8712/osdep_service.h

+0 −6
Original line number Diff line number Diff line
@@ -115,12 +115,6 @@ For the following list_xxx operations, 
caller must guarantee the atomic context.

Otherwise, there will be racing condition.

*/

static inline void list_insert_tail(struct list_head *plist,

				    struct list_head *phead)

{

	list_add_tail(plist, phead);

}



static inline u32 _down_sema(struct semaphore *sema)

{

	if (down_interruptible(sema))

drivers/staging/rtl8712/rtl8712_recv.c

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter) 
			break;

		precvbuf->ref_cnt = 0;

		precvbuf->adapter = padapter;

		list_insert_tail(&precvbuf->list,

		list_add_tail(&precvbuf->list,

				 &(precvpriv->free_recv_buf_queue.queue));

		precvbuf++;

	}
@@ -146,7 +146,7 @@ int r8712_free_recvframe(union recv_frame *precvframe, 
	}

	spin_lock_irqsave(&pfree_recv_queue->lock, irqL);

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

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

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

			 get_list_head(pfree_recv_queue));

	if (padapter != NULL) {

		if (pfree_recv_queue == &precvpriv->free_recv_queue)
@@ -297,7 +297,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter, 
			}

			/* Then enqueue the 0~(n-1) fragment to the defrag_q */

			phead = get_list_head(pdefrag_q);

			list_insert_tail(&pfhdr->list, phead);

			list_add_tail(&pfhdr->list, phead);

			prtnframe = NULL;

		} else {

			/* can't find this ta's defrag_queue, so free this
@@ -312,7 +312,7 @@ union recv_frame *r8712_recvframe_chk_defrag(struct _adapter *padapter, 
		 * enqueue the last fragment */

		if (pdefrag_q != NULL) {

			phead = get_list_head(pdefrag_q);

			list_insert_tail(&pfhdr->list, phead);

			list_add_tail(&pfhdr->list, phead);

			/*call recvframe_defrag to defrag*/

			precv_frame = recvframe_defrag(padapter, pdefrag_q);

			prtnframe = precv_frame;
@@ -512,7 +512,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, 
			break;

	}

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

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

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

	return true;

}

drivers/staging/rtl8712/rtl871x_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static sint _enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) 
	if (obj == NULL)

		return _SUCCESS;

	spin_lock_irqsave(&queue->lock, irqL);

	list_insert_tail(&obj->list, &queue->queue);

	list_add_tail(&obj->list, &queue->queue);

	spin_unlock_irqrestore(&queue->lock, irqL);

	return _SUCCESS;

}
@@ -190,7 +190,7 @@ u32 r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj) 
		return _FAIL;

	queue = &pcmdpriv->cmd_queue;

	spin_lock_irqsave(&queue->lock, irqL);

	list_insert_tail(&obj->list, &queue->queue);

	list_add_tail(&obj->list, &queue->queue);

	spin_unlock_irqrestore(&queue->lock, irqL);

	up(&pcmdpriv->cmd_queue_sema);

	return _SUCCESS;
@@ -956,7 +956,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter, 
				goto createbss_cmd_fail;

			pwlan->last_scanned = jiffies;

		} else

			list_insert_tail(&(pwlan->list),

			list_add_tail(&(pwlan->list),

					 &pmlmepriv->scanned_queue.queue);

		pnetwork->Length = r8712_get_ndis_wlan_bssid_ex_sz(pnetwork);

		memcpy(&(pwlan->network), pnetwork, pnetwork->Length);

drivers/staging/rtl8712/rtl871x_io.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ uint r8712_alloc_io_queue(struct _adapter *adapter) 
	pio_req = (struct io_req *)(pio_queue->free_ioreqs_buf);

	for (i = 0; i < NUM_IOREQ; i++) {

		INIT_LIST_HEAD(&pio_req->list);

		list_insert_tail(&pio_req->list, &pio_queue->free_ioreqs);

		list_add_tail(&pio_req->list, &pio_queue->free_ioreqs);

		pio_req++;

	}

	if ((register_intf_hdl((u8 *)adapter, &(pio_queue->intf))) == _FAIL)

drivers/staging/rtl8712/rtl871x_mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static sint _init_mlme_priv(struct _adapter *padapter) 
	pnetwork = (struct wlan_network *)pbuf;

	for (i = 0; i < MAX_BSS_CNT; i++) {

		INIT_LIST_HEAD(&(pnetwork->list));

		list_insert_tail(&(pnetwork->list),

		list_add_tail(&(pnetwork->list),

				 &(pmlmepriv->free_bss_pool.queue));

		pnetwork++;

	}
@@ -118,7 +118,7 @@ static void _free_network(struct mlme_priv *pmlmepriv, 
		return;

	spin_lock_irqsave(&free_queue->lock, irqL);

	list_delete(&pnetwork->list);

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

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

	pmlmepriv->num_of_scanned--;

	spin_unlock_irqrestore(&free_queue->lock, irqL);

}
@@ -133,7 +133,7 @@ static void _free_network_nolock(struct mlme_priv *pmlmepriv, 
	if (pnetwork->fixed == true)

		return;

	list_delete(&pnetwork->list);

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

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

	pmlmepriv->num_of_scanned--;

}
@@ -437,7 +437,7 @@ static void update_scanned_network(struct _adapter *adapter, 
			bssid_ex_sz = r8712_get_ndis_wlan_bssid_ex_sz(target);

			target->Length = bssid_ex_sz;

			memcpy(&pnetwork->network, target, bssid_ex_sz);

			list_insert_tail(&pnetwork->list, &queue->queue);

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

		}

	} else {

		/* we have an entry and we are going to update it. But