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

staging: rtl8712: remove wrapper function _init_listhead 



_init_listhead is just an inline wrapper around INIT_LIST_HEAD.  This
patch removes the wrapper and directly uses INIT_LIST_HEAD instead.

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

drivers/staging/rtl8712/osdep_service.h

+1 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct __queue { 


#define _init_queue(pqueue)				\

	do {						\

		_init_listhead(&((pqueue)->queue));	\

		INIT_LIST_HEAD(&((pqueue)->queue));	\

		spin_lock_init(&((pqueue)->lock));	\

	} while (0)
@@ -137,11 +137,6 @@ static inline u32 _down_sema(struct semaphore *sema) 
		return _SUCCESS;

}



static inline void _init_listhead(struct list_head *list)

{

	INIT_LIST_HEAD(list);

}



static inline u32 _queue_empty(struct  __queue *pqueue)

{

	return is_list_empty(&(pqueue->queue));

drivers/staging/rtl8712/rtl8712_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter) 
			      ((addr_t) (precvpriv->pallocated_recv_buf) & 3);

	precvbuf = (struct recv_buf *)precvpriv->precv_buf;

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

		_init_listhead(&precvbuf->list);

		INIT_LIST_HEAD(&precvbuf->list);

		spin_lock_init(&precvbuf->recvbuf_lock);

		res = r8712_os_recvbuf_resource_alloc(padapter, precvbuf);

		if (res == _FAIL)
@@ -1061,7 +1061,7 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb) 
		precvframe = r8712_alloc_recvframe(pfree_recv_queue);

		if (precvframe == NULL)

			goto  _exit_recvbuf2recvframe;

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

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

		precvframe->u.hdr.precvbuf = NULL; /*can't access the precvbuf*/

		precvframe->u.hdr.len = 0;

		tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE;

drivers/staging/rtl8712/rtl871x_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval) 
		kfree((u8 *) ph2c);

		return _FAIL;

	}

	_init_listhead(&ph2c->list);

	INIT_LIST_HEAD(&ph2c->list);

	ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg);

	ph2c->parmbuf = (unsigned char *)prdrfparm;

	ph2c->cmdsz =  sizeof(struct readRF_parm);
@@ -452,7 +452,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) 
	pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (pcmd == NULL)

		return _FAIL;

	_init_listhead(&pcmd->list);

	INIT_LIST_HEAD(&pcmd->list);

	pcmd->cmdcode = _CreateBss_CMD_;

	pcmd->parmbuf = (unsigned char *)pdev_network;

	pcmd->cmdsz = r8712_get_ndis_wlan_bssid_ex_sz((
@@ -606,7 +606,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) 
				psecnetwork->InfrastructureMode);

	psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength);

#endif

	_init_listhead(&pcmd->list);

	INIT_LIST_HEAD(&pcmd->list);

	pcmd->cmdcode = _JoinBss_CMD_;

	pcmd->parmbuf = (unsigned char *)psecnetwork;

	pcmd->rsp = NULL;
@@ -758,7 +758,7 @@ u8 r8712_gettssi_cmd(struct _adapter *padapter, u8 offset, u8 *pval) 
		kfree((unsigned char *) ph2c);

		return _FAIL;

	}

	_init_listhead(&ph2c->list);

	INIT_LIST_HEAD(&ph2c->list);

	ph2c->cmdcode = GEN_CMD_CODE(_ReadTSSI);

	ph2c->parmbuf = (unsigned char *)prdtssiparm;

	ph2c->cmdsz = sizeof(struct readTSSI_parm);

drivers/staging/rtl8712/rtl871x_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ struct evt_priv { 


#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \

do {\

	_init_listhead(&pcmd->list);\

	INIT_LIST_HEAD(&pcmd->list);\

	pcmd->cmdcode = code;\

	pcmd->parmbuf = (u8 *)(pparm);\

	pcmd->cmdsz = sizeof(*pparm);\

drivers/staging/rtl8712/rtl871x_io.c

+4 −4
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ uint r8712_alloc_io_queue(struct _adapter *adapter) 
	pio_queue = kmalloc(sizeof(*pio_queue), GFP_ATOMIC);

	if (pio_queue == NULL)

		goto alloc_io_queue_fail;

	_init_listhead(&pio_queue->free_ioreqs);

	_init_listhead(&pio_queue->processing);

	_init_listhead(&pio_queue->pending);

	INIT_LIST_HEAD(&pio_queue->free_ioreqs);

	INIT_LIST_HEAD(&pio_queue->processing);

	INIT_LIST_HEAD(&pio_queue->pending);

	spin_lock_init(&pio_queue->lock);

	pio_queue->pallocated_free_ioreqs_buf = kmalloc(NUM_IOREQ *

							(sizeof(struct io_req)) + 4,
@@ -131,7 +131,7 @@ uint r8712_alloc_io_queue(struct _adapter *adapter) 
			& 3);

	pio_req = (struct io_req *)(pio_queue->free_ioreqs_buf);

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

		_init_listhead(&pio_req->list);

		INIT_LIST_HEAD(&pio_req->list);

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

		pio_req++;

	}