Skip to content

Commit

Permalink
staging: rtl8188eu: Remove _rtw_init_listhead(), wrapper for INIT_LIS…
Browse files Browse the repository at this point in the history 
…T_HEAD()

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
navin patidar authored and Greg Kroah-Hartman committed Jun 27, 2014
1 parent 9c4b0e7 commit aa3f5cc
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 43 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/rtl8188eu/core/rtw_ap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
paclnode = &pacl_list->aclnode[i];

if (!paclnode->valid) {
_rtw_init_listhead(&paclnode->list);
INIT_LIST_HEAD(&paclnode->list);

memcpy(paclnode->addr, addr, ETH_ALEN);

Expand Down Expand Up @@ -1910,11 +1910,11 @@ void start_ap_mode(struct adapter *padapter)
pmlmepriv->p2p_probe_resp_ie = NULL;

/* for ACL */
_rtw_init_listhead(&(pacl_list->acl_node_q.queue));
INIT_LIST_HEAD(&(pacl_list->acl_node_q.queue));
pacl_list->num = 0;
pacl_list->mode = 0;
for (i = 0; i < NUM_ACL; i++) {
_rtw_init_listhead(&pacl_list->aclnode[i].list);
INIT_LIST_HEAD(&pacl_list->aclnode[i].list);
pacl_list->aclnode[i].valid = false;
}
}
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/rtl8188eu/core/rtw_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
return _FAIL;
}

_rtw_init_listhead(&ph2c->list);
INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetBBReg);
ph2c->parmbuf = (unsigned char *)prdbbparm;
ph2c->cmdsz = sizeof(struct readBB_parm);
Expand Down Expand Up @@ -715,7 +715,7 @@ u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
goto exit;
}

_rtw_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);
Expand Down Expand Up @@ -774,7 +774,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
goto exit;
}

_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _CreateBss_CMD_;
pcmd->parmbuf = (unsigned char *)pdev_network;
pcmd->cmdsz = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network);
Expand All @@ -801,7 +801,7 @@ u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned
goto exit;
}

_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = GEN_CMD_CODE(_CreateBss);
pcmd->parmbuf = pbss;
pcmd->cmdsz = sz;
Expand Down Expand Up @@ -944,7 +944,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)

pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */

_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);
pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */
pcmd->parmbuf = (unsigned char *)psecnetwork;
pcmd->rsp = NULL;
Expand Down Expand Up @@ -1194,7 +1194,7 @@ u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
goto exit;
}

_rtw_init_listhead(&ph2c->list);
INIT_LIST_HEAD(&ph2c->list);
ph2c->cmdcode = GEN_CMD_CODE(_GetRaTable);
ph2c->parmbuf = (unsigned char *)pgetrttblparm;
ph2c->cmdsz = sizeof(struct getratable_parm);
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8188eu/core/rtw_mlme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int _rtw_init_mlme_priv(struct adapter *padapter)
pnetwork = (struct wlan_network *)pbuf;

for (i = 0; i < MAX_BSS_CNT; i++) {
_rtw_init_listhead(&(pnetwork->list));
INIT_LIST_HEAD(&(pnetwork->list));

list_add_tail(&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue));

Expand Down Expand Up @@ -1685,7 +1685,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
pcmd->cmdsz = (sizeof(struct setauth_parm));
pcmd->rsp = NULL;
pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
("after enqueue set_auth_cmd, auth_mode=%x\n",
psecuritypriv->dot11AuthAlgrthm));
Expand Down Expand Up @@ -1766,7 +1766,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in
pcmd->cmdsz = (sizeof(struct setkey_parm));
pcmd->rsp = NULL;
pcmd->rspsz = 0;
_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);
res = rtw_enqueue_cmd(pcmdpriv, pcmd);
return res;

Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7066,7 +7066,7 @@ void report_survey_event(struct adapter *padapter,
return;
}

_rtw_init_listhead(&pcmd_obj->list);
INIT_LIST_HEAD(&pcmd_obj->list);

pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz;
Expand Down Expand Up @@ -7118,7 +7118,7 @@ void report_surveydone_event(struct adapter *padapter)
return;
}

_rtw_init_listhead(&pcmd_obj->list);
INIT_LIST_HEAD(&pcmd_obj->list);

pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz;
Expand Down Expand Up @@ -7164,7 +7164,7 @@ void report_join_res(struct adapter *padapter, int res)
return;
}

_rtw_init_listhead(&pcmd_obj->list);
INIT_LIST_HEAD(&pcmd_obj->list);

pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz;
Expand Down Expand Up @@ -7217,7 +7217,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
return;
}

_rtw_init_listhead(&pcmd_obj->list);
INIT_LIST_HEAD(&pcmd_obj->list);

pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz;
Expand Down Expand Up @@ -7272,7 +7272,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
return;
}

_rtw_init_listhead(&pcmd_obj->list);
INIT_LIST_HEAD(&pcmd_obj->list);

pcmd_obj->cmdcode = GEN_CMD_CODE(_Set_MLME_EVT);
pcmd_obj->cmdsz = cmdsz;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/core/rtw_mp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;

for (i = 0; i < num_xmit_extbuf; i++) {
_rtw_init_listhead(&pxmitbuf->list);
INIT_LIST_HEAD(&pxmitbuf->list);

pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/rtl8188eu/core/rtw_recv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;

for (i = 0; i < NR_RECVFRAME; i++) {
_rtw_init_listhead(&(precvframe->list));
INIT_LIST_HEAD(&(precvframe->list));

list_add_tail(&(precvframe->list),
&(precvpriv->free_recv_queue.queue));
Expand Down Expand Up @@ -169,7 +169,7 @@ struct recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue)
void rtw_init_recvframe(struct recv_frame *precvframe, struct recv_priv *precvpriv)
{
/* Perry: This can be removed */
_rtw_init_listhead(&precvframe->list);
INIT_LIST_HEAD(&precvframe->list);

precvframe->len = 0;
}
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ static void _rtw_init_stainfo(struct sta_info *psta)
memset((u8 *)psta, 0, sizeof (struct sta_info));

spin_lock_init(&psta->lock);
_rtw_init_listhead(&psta->list);
_rtw_init_listhead(&psta->hash_list);
INIT_LIST_HEAD(&psta->list);
INIT_LIST_HEAD(&psta->hash_list);
_rtw_init_queue(&psta->sleep_q);
psta->sleepq_len = 0;

Expand All @@ -42,9 +42,9 @@ static void _rtw_init_stainfo(struct sta_info *psta)

#ifdef CONFIG_88EU_AP_MODE

_rtw_init_listhead(&psta->asoc_list);
INIT_LIST_HEAD(&psta->asoc_list);

_rtw_init_listhead(&psta->auth_list);
INIT_LIST_HEAD(&psta->auth_list);

psta->expire_to = 0;

Expand Down Expand Up @@ -98,7 +98,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
for (i = 0; i < NUM_STA; i++) {
_rtw_init_stainfo(psta);

_rtw_init_listhead(&(pstapriv->sta_hash[i]));
INIT_LIST_HEAD(&(pstapriv->sta_hash[i]));

list_add_tail(&psta->list, get_list_head(&pstapriv->free_sta_queue));

Expand All @@ -110,8 +110,8 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
pstapriv->sta_dz_bitmap = 0;
pstapriv->tim_bitmap = 0;

_rtw_init_listhead(&pstapriv->asoc_list);
_rtw_init_listhead(&pstapriv->auth_list);
INIT_LIST_HEAD(&pstapriv->asoc_list);
INIT_LIST_HEAD(&pstapriv->auth_list);
spin_lock_init(&pstapriv->asoc_list_lock);
spin_lock_init(&pstapriv->auth_list_lock);
pstapriv->asoc_list_cnt = 0;
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/rtl8188eu/core/rtw_xmit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };

static void _init_txservq(struct tx_servq *ptxservq)
{
_rtw_init_listhead(&ptxservq->tx_pending);
INIT_LIST_HEAD(&ptxservq->tx_pending);
_rtw_init_queue(&ptxservq->sta_pending);
ptxservq->qcnt = 0;
}
Expand All @@ -44,8 +44,8 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
_init_txservq(&psta_xmitpriv->bk_q);
_init_txservq(&psta_xmitpriv->vi_q);
_init_txservq(&psta_xmitpriv->vo_q);
_rtw_init_listhead(&psta_xmitpriv->legacy_dz);
_rtw_init_listhead(&psta_xmitpriv->apsd);
INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz);
INIT_LIST_HEAD(&psta_xmitpriv->apsd);

}

Expand Down Expand Up @@ -100,7 +100,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;

for (i = 0; i < NR_XMITFRAME; i++) {
_rtw_init_listhead(&(pxframe->list));
INIT_LIST_HEAD(&(pxframe->list));

pxframe->padapter = padapter;
pxframe->frame_tag = NULL_FRAMETAG;
Expand Down Expand Up @@ -138,7 +138,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;

for (i = 0; i < NR_XMITBUFF; i++) {
_rtw_init_listhead(&pxmitbuf->list);
INIT_LIST_HEAD(&pxmitbuf->list);

pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter;
Expand Down Expand Up @@ -178,7 +178,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmit_extbuf;

for (i = 0; i < num_xmit_extbuf; i++) {
_rtw_init_listhead(&pxmitbuf->list);
INIT_LIST_HEAD(&pxmitbuf->list);

pxmitbuf->priv_data = NULL;
pxmitbuf->padapter = padapter;
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rtl8188eu/include/osdep_service.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ void *rtw_malloc2d(int h, int w, int size);

void _rtw_memcpy(void *dec, void *sour, u32 sz);

void _rtw_init_listhead(struct list_head *list);
void rtw_list_delete(struct list_head *plist);

u32 _rtw_down_sema(struct semaphore *sema);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/include/rtw_cmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct evt_priv {

#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \
do {\
_rtw_init_listhead(&pcmd->list);\
INIT_LIST_HEAD(&pcmd->list);\
pcmd->cmdcode = code;\
pcmd->parmbuf = (u8 *)(pparm);\
pcmd->cmdsz = sizeof(*pparm);\
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4801,7 +4801,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
pcmd->rsp = NULL;
pcmd->rspsz = 0;

_rtw_init_listhead(&pcmd->list);
INIT_LIST_HEAD(&pcmd->list);

res = rtw_enqueue_cmd(pcmdpriv, pcmd);

Expand Down
7 changes: 1 addition & 6 deletions drivers/staging/rtl8188eu/os_dep/osdep_service.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ void *rtw_malloc2d(int h, int w, int size)
return a;
}

void _rtw_init_listhead(struct list_head *list)
{
INIT_LIST_HEAD(list);
}

u32 _rtw_down_sema(struct semaphore *sema)
{
if (down_interruptible(sema))
Expand All @@ -104,7 +99,7 @@ u32 _rtw_down_sema(struct semaphore *sema)

void _rtw_init_queue(struct __queue *pqueue)
{
_rtw_init_listhead(&(pqueue->queue));
INIT_LIST_HEAD(&(pqueue->queue));
spin_lock_init(&(pqueue->lock));
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
goto _exit_recvbuf2recvframe;
}

_rtw_init_listhead(&precvframe->list);
INIT_LIST_HEAD(&precvframe->list);
precvframe->len = 0;

update_recvframe_attrib_88e(precvframe, prxstat);
Expand Down

0 comments on commit aa3f5cc

Please sign in to comment.