hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: James A Shackleford <shack@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James A Shackleford 2014-06-24 22:52:34 -04:00 committed by Greg Kroah-Hartman
parent 9c9a95b619
commit 534c4acd1d
10 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8712/osdep_service.h
View File

@ -54,7 +54,7 @@ struct __queue {
#define _init_queue(pqueue) \ #define _init_queue(pqueue) \
do { \ do { \
_init_listhead(&((pqueue)->queue)); \ INIT_LIST_HEAD(&((pqueue)->queue)); \
spin_lock_init(&((pqueue)->lock)); \ spin_lock_init(&((pqueue)->lock)); \
} while (0) } while (0)
@ -137,11 +137,6 @@ static inline u32 _down_sema(struct semaphore *sema)
return _SUCCESS; return _SUCCESS;
} }
static inline void _init_listhead(struct list_head *list)
{
INIT_LIST_HEAD(list);
}
static inline u32 _queue_empty(struct __queue *pqueue) static inline u32 _queue_empty(struct __queue *pqueue)
{ {
return is_list_empty(&(pqueue->queue)); return is_list_empty(&(pqueue->queue));

4
drivers/staging/rtl8712/rtl8712_recv.c
View File

@ -66,7 +66,7 @@ int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter)
((addr_t) (precvpriv->pallocated_recv_buf) & 3); ((addr_t) (precvpriv->pallocated_recv_buf) & 3);
precvbuf = (struct recv_buf *)precvpriv->precv_buf; precvbuf = (struct recv_buf *)precvpriv->precv_buf;
for (i = 0; i < NR_RECVBUFF; i++) { for (i = 0; i < NR_RECVBUFF; i++) {
_init_listhead(&precvbuf->list); INIT_LIST_HEAD(&precvbuf->list);
spin_lock_init(&precvbuf->recvbuf_lock); spin_lock_init(&precvbuf->recvbuf_lock);
res = r8712_os_recvbuf_resource_alloc(padapter, precvbuf); res = r8712_os_recvbuf_resource_alloc(padapter, precvbuf);
if (res == _FAIL) if (res == _FAIL)
@ -1061,7 +1061,7 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb)
precvframe = r8712_alloc_recvframe(pfree_recv_queue); precvframe = r8712_alloc_recvframe(pfree_recv_queue);
if (precvframe == NULL) if (precvframe == NULL)
goto _exit_recvbuf2recvframe; 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.precvbuf = NULL; /*can't access the precvbuf*/
precvframe->u.hdr.len = 0; precvframe->u.hdr.len = 0;
tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE; tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE;

8
drivers/staging/rtl8712/rtl871x_cmd.c
View File

@ -413,7 +413,7 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
kfree((u8 *) ph2c); kfree((u8 *) ph2c);
return _FAIL; return _FAIL;
} }
_init_listhead(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg); ph2c->cmdcode = GEN_CMD_CODE(_GetRFReg);
ph2c->parmbuf = (unsigned char *)prdrfparm; ph2c->parmbuf = (unsigned char *)prdrfparm;
ph2c->cmdsz = sizeof(struct readRF_parm); ph2c->cmdsz = sizeof(struct readRF_parm);
@ -452,7 +452,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL) if (pcmd == NULL)
return _FAIL; return _FAIL;
_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _CreateBss_CMD_; pcmd->cmdcode = _CreateBss_CMD_;
pcmd->parmbuf = (unsigned char *)pdev_network; pcmd->parmbuf = (unsigned char *)pdev_network;
pcmd->cmdsz = r8712_get_ndis_wlan_bssid_ex_sz(( 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->InfrastructureMode);
psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength); psecnetwork->IELength = cpu_to_le32(psecnetwork->IELength);
#endif #endif
_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _JoinBss_CMD_; pcmd->cmdcode = _JoinBss_CMD_;
pcmd->parmbuf = (unsigned char *)psecnetwork; pcmd->parmbuf = (unsigned char *)psecnetwork;
pcmd->rsp = NULL; pcmd->rsp = NULL;
@ -758,7 +758,7 @@ u8 r8712_gettssi_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
kfree((unsigned char *) ph2c); kfree((unsigned char *) ph2c);
return _FAIL; return _FAIL;
} }
_init_listhead(&ph2c->list); INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_ReadTSSI); ph2c->cmdcode = GEN_CMD_CODE(_ReadTSSI);
ph2c->parmbuf = (unsigned char *)prdtssiparm; ph2c->parmbuf = (unsigned char *)prdtssiparm;
ph2c->cmdsz = sizeof(struct readTSSI_parm); ph2c->cmdsz = sizeof(struct readTSSI_parm);

2
drivers/staging/rtl8712/rtl871x_cmd.h
View File

@ -83,7 +83,7 @@ struct evt_priv {
#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \ #define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \
do {\ do {\
_init_listhead(&pcmd->list);\ INIT_LIST_HEAD(&pcmd->list);\
pcmd->cmdcode = code;\ pcmd->cmdcode = code;\
pcmd->parmbuf = (u8 *)(pparm);\ pcmd->parmbuf = (u8 *)(pparm);\
pcmd->cmdsz = sizeof(*pparm);\ pcmd->cmdsz = sizeof(*pparm);\

8
drivers/staging/rtl8712/rtl871x_io.c
View File

@ -115,9 +115,9 @@ uint r8712_alloc_io_queue(struct _adapter *adapter)
pio_queue = kmalloc(sizeof(*pio_queue), GFP_ATOMIC); pio_queue = kmalloc(sizeof(*pio_queue), GFP_ATOMIC);
if (pio_queue == NULL) if (pio_queue == NULL)
goto alloc_io_queue_fail; goto alloc_io_queue_fail;
_init_listhead(&pio_queue->free_ioreqs); INIT_LIST_HEAD(&pio_queue->free_ioreqs);
_init_listhead(&pio_queue->processing); INIT_LIST_HEAD(&pio_queue->processing);
_init_listhead(&pio_queue->pending); INIT_LIST_HEAD(&pio_queue->pending);
spin_lock_init(&pio_queue->lock); spin_lock_init(&pio_queue->lock);
pio_queue->pallocated_free_ioreqs_buf = kmalloc(NUM_IOREQ * pio_queue->pallocated_free_ioreqs_buf = kmalloc(NUM_IOREQ *
(sizeof(struct io_req)) + 4, (sizeof(struct io_req)) + 4,
@ -131,7 +131,7 @@ uint r8712_alloc_io_queue(struct _adapter *adapter)
& 3); & 3);
pio_req = (struct io_req *)(pio_queue->free_ioreqs_buf); pio_req = (struct io_req *)(pio_queue->free_ioreqs_buf);
for (i = 0; i < NUM_IOREQ; i++) { 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); list_insert_tail(&pio_req->list, &pio_queue->free_ioreqs);
pio_req++; pio_req++;
} }

6
drivers/staging/rtl8712/rtl871x_mlme.c
View File

@ -69,7 +69,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
pmlmepriv->free_bss_buf = pbuf; pmlmepriv->free_bss_buf = pbuf;
pnetwork = (struct wlan_network *)pbuf; pnetwork = (struct wlan_network *)pbuf;
for (i = 0; i < MAX_BSS_CNT; i++) { for (i = 0; i < MAX_BSS_CNT; i++) {
_init_listhead(&(pnetwork->list)); INIT_LIST_HEAD(&(pnetwork->list));
list_insert_tail(&(pnetwork->list), list_insert_tail(&(pnetwork->list),
&(pmlmepriv->free_bss_pool.queue)); &(pmlmepriv->free_bss_pool.queue));
pnetwork++; pnetwork++;
@ -1227,7 +1227,7 @@ sint r8712_set_auth(struct _adapter *adapter,
pcmd->cmdsz = sizeof(struct setauth_parm); pcmd->cmdsz = sizeof(struct setauth_parm);
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
r8712_enqueue_cmd(pcmdpriv, pcmd); r8712_enqueue_cmd(pcmdpriv, pcmd);
return _SUCCESS; return _SUCCESS;
} }
@ -1299,7 +1299,7 @@ sint r8712_set_key(struct _adapter *adapter,
pcmd->cmdsz = (sizeof(struct setkey_parm)); pcmd->cmdsz = (sizeof(struct setkey_parm));
pcmd->rsp = NULL; pcmd->rsp = NULL;
pcmd->rspsz = 0; pcmd->rspsz = 0;
_init_listhead(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
r8712_enqueue_cmd(pcmdpriv, pcmd); r8712_enqueue_cmd(pcmdpriv, pcmd);
return ret; return ret;

2
drivers/staging/rtl8712/rtl871x_mp.c
View File

@ -65,7 +65,7 @@ static int init_mp_priv(struct mp_priv *pmp_priv)
((addr_t)(pmp_priv->pallocated_mp_xmitframe_buf) & 3); ((addr_t)(pmp_priv->pallocated_mp_xmitframe_buf) & 3);
pmp_xmitframe = (struct mp_xmit_frame *)pmp_priv->pmp_xmtframe_buf; pmp_xmitframe = (struct mp_xmit_frame *)pmp_priv->pmp_xmtframe_buf;
for (i = 0; i < NR_MP_XMITFRAME; i++) { for (i = 0; i < NR_MP_XMITFRAME; i++) {
_init_listhead(&(pmp_xmitframe->list)); INIT_LIST_HEAD(&(pmp_xmitframe->list));
list_insert_tail(&(pmp_xmitframe->list), list_insert_tail(&(pmp_xmitframe->list),
&(pmp_priv->free_mp_xmitqueue.queue)); &(pmp_priv->free_mp_xmitqueue.queue));
pmp_xmitframe->pkt = NULL; pmp_xmitframe->pkt = NULL;

2
drivers/staging/rtl8712/rtl871x_recv.c
View File

@ -86,7 +86,7 @@ sint _r8712_init_recv_priv(struct recv_priv *precvpriv,
(RXFRAME_ALIGN_SZ-1)); (RXFRAME_ALIGN_SZ-1));
precvframe = (union recv_frame *)precvpriv->precv_frame_buf; precvframe = (union recv_frame *)precvpriv->precv_frame_buf;
for (i = 0; i < NR_RECVFRAME; i++) { for (i = 0; i < NR_RECVFRAME; i++) {
_init_listhead(&(precvframe->u.list)); INIT_LIST_HEAD(&(precvframe->u.list));
list_insert_tail(&(precvframe->u.list), list_insert_tail(&(precvframe->u.list),
&(precvpriv->free_recv_queue.queue)); &(precvpriv->free_recv_queue.queue));
r8712_os_recv_resource_alloc(padapter, precvframe); r8712_os_recv_resource_alloc(padapter, precvframe);

14
drivers/staging/rtl8712/rtl871x_sta_mgt.c
View File

@ -38,12 +38,12 @@ static void _init_stainfo(struct sta_info *psta)
{ {
memset((u8 *)psta, 0, sizeof(struct sta_info)); memset((u8 *)psta, 0, sizeof(struct sta_info));
spin_lock_init(&psta->lock); spin_lock_init(&psta->lock);
_init_listhead(&psta->list); INIT_LIST_HEAD(&psta->list);
_init_listhead(&psta->hash_list); INIT_LIST_HEAD(&psta->hash_list);
_r8712_init_sta_xmit_priv(&psta->sta_xmitpriv); _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv);
_r8712_init_sta_recv_priv(&psta->sta_recvpriv); _r8712_init_sta_recv_priv(&psta->sta_recvpriv);
_init_listhead(&psta->asoc_list); INIT_LIST_HEAD(&psta->asoc_list);
_init_listhead(&psta->auth_list); INIT_LIST_HEAD(&psta->auth_list);
} }
u32 _r8712_init_sta_priv(struct sta_priv *pstapriv) u32 _r8712_init_sta_priv(struct sta_priv *pstapriv)
@ -65,13 +65,13 @@ u32 _r8712_init_sta_priv(struct sta_priv *pstapriv)
psta = (struct sta_info *)(pstapriv->pstainfo_buf); psta = (struct sta_info *)(pstapriv->pstainfo_buf);
for (i = 0; i < NUM_STA; i++) { for (i = 0; i < NUM_STA; i++) {
_init_stainfo(psta); _init_stainfo(psta);
_init_listhead(&(pstapriv->sta_hash[i])); INIT_LIST_HEAD(&(pstapriv->sta_hash[i]));
list_insert_tail(&psta->list, list_insert_tail(&psta->list,
get_list_head(&pstapriv->free_sta_queue)); get_list_head(&pstapriv->free_sta_queue));
psta++; psta++;
} }
_init_listhead(&pstapriv->asoc_list); INIT_LIST_HEAD(&pstapriv->asoc_list);
_init_listhead(&pstapriv->auth_list); INIT_LIST_HEAD(&pstapriv->auth_list);
return _SUCCESS; return _SUCCESS;
} }

12
drivers/staging/rtl8712/rtl871x_xmit.c
View File

@ -43,7 +43,7 @@ static void free_hwxmits(struct _adapter *padapter);
static void _init_txservq(struct tx_servq *ptxservq) static void _init_txservq(struct tx_servq *ptxservq)
{ {
_init_listhead(&ptxservq->tx_pending); INIT_LIST_HEAD(&ptxservq->tx_pending);
_init_queue(&ptxservq->sta_pending); _init_queue(&ptxservq->sta_pending);
ptxservq->qcnt = 0; ptxservq->qcnt = 0;
} }
@ -57,8 +57,8 @@ void _r8712_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
_init_txservq(&psta_xmitpriv->bk_q); _init_txservq(&psta_xmitpriv->bk_q);
_init_txservq(&psta_xmitpriv->vi_q); _init_txservq(&psta_xmitpriv->vi_q);
_init_txservq(&psta_xmitpriv->vo_q); _init_txservq(&psta_xmitpriv->vo_q);
_init_listhead(&psta_xmitpriv->legacy_dz); INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz);
_init_listhead(&psta_xmitpriv->apsd); INIT_LIST_HEAD(&psta_xmitpriv->apsd);
} }
sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
@ -97,7 +97,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
((addr_t) (pxmitpriv->pallocated_frame_buf) & 3); ((addr_t) (pxmitpriv->pallocated_frame_buf) & 3);
pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf; pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf;
for (i = 0; i < NR_XMITFRAME; i++) { for (i = 0; i < NR_XMITFRAME; i++) {
_init_listhead(&(pxframe->list)); INIT_LIST_HEAD(&(pxframe->list));
pxframe->padapter = padapter; pxframe->padapter = padapter;
pxframe->frame_tag = DATA_FRAMETAG; pxframe->frame_tag = DATA_FRAMETAG;
pxframe->pkt = NULL; pxframe->pkt = NULL;
@ -134,7 +134,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
((addr_t)(pxmitpriv->pallocated_xmitbuf) & 3); ((addr_t)(pxmitpriv->pallocated_xmitbuf) & 3);
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
for (i = 0; i < NR_XMITBUFF; i++) { for (i = 0; i < NR_XMITBUFF; i++) {
_init_listhead(&pxmitbuf->list); INIT_LIST_HEAD(&pxmitbuf->list);
pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ, pxmitbuf->pallocated_buf = kmalloc(MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ,
GFP_ATOMIC); GFP_ATOMIC);
if (pxmitbuf->pallocated_buf == NULL) if (pxmitbuf->pallocated_buf == NULL)
@ -1005,7 +1005,7 @@ static void init_hwxmits(struct hw_xmit *phwxmit, sint entry)
for (i = 0; i < entry; i++, phwxmit++) { for (i = 0; i < entry; i++, phwxmit++) {
spin_lock_init(&phwxmit->xmit_lock); spin_lock_init(&phwxmit->xmit_lock);
_init_listhead(&phwxmit->pending); INIT_LIST_HEAD(&phwxmit->pending);
phwxmit->txcmdcnt = 0; phwxmit->txcmdcnt = 0;
phwxmit->accnt = 0; phwxmit->accnt = 0;
} }