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>

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 425f0f1b8c2ff340c4cc925b7853ad9064d0dea8..81f48a60646d590f6b904d7f8ef4d6a8286a905d 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -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));

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index fb947c1e076fa19df8d8c9ccd6ef1ece6116110d..e311a601a4fd95197ef728c8f7ccf7de2e78b356 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -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;

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 1775462e5330bd0550177b24fbb035e0f9e60b5f..646c5cd5245d51eb4104aa4e5c10f96678dd1636 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -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);

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index 0ce79b1c4ee278c52bd52c34382c5eb47c285839..cb8225b94cf10bdeaf71ae3468dd38a79ed934bf 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -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);\

diff --git a/drivers/staging/rtl8712/rtl871x_io.c b/drivers/staging/rtl8712/rtl871x_io.c
index e881b0d9c34f6d405fcd26f4295c232d13f439be..c42a57878655b2a71b95ac547a1710bc98a17ad9 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_io.c
+++ b/drivers/staging/rtl8712/rtl871x_io.c
@@ -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++;
        }

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 26b8f3788fd3ec277bb04bb38407e7eb57206c4a..3000b2ac4cd4f86066c1b2f58d70db345beede40 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -69,7 +69,7 @@ static sint _init_mlme_priv(struct _adapter *padapter)
        pmlmepriv->free_bss_buf = pbuf;
        pnetwork = (struct wlan_network *)pbuf;
        for (i = 0; i < MAX_BSS_CNT; i++) {
-               _init_listhead(&(pnetwork->list));
+               INIT_LIST_HEAD(&(pnetwork->list));
                list_insert_tail(&(pnetwork->list),
                                 &(pmlmepriv->free_bss_pool.queue));
                pnetwork++;
@@ -1227,7 +1227,7 @@ sint r8712_set_auth(struct _adapter *adapter,
        pcmd->cmdsz = sizeof(struct setauth_parm);
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
-       _init_listhead(&pcmd->list);
+       INIT_LIST_HEAD(&pcmd->list);
        r8712_enqueue_cmd(pcmdpriv, pcmd);
        return _SUCCESS;
 }
@@ -1299,7 +1299,7 @@ sint r8712_set_key(struct _adapter *adapter,
        pcmd->cmdsz =  (sizeof(struct setkey_parm));
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
-       _init_listhead(&pcmd->list);
+       INIT_LIST_HEAD(&pcmd->list);
        r8712_enqueue_cmd(pcmdpriv, pcmd);
        return ret;
 

diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c
index e48486cdcca0e2e26c82bea8cfa8da38b235cd26..594d023d5530f1017dfde5206f33e221021859f4 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mp.c
+++ b/drivers/staging/rtl8712/rtl871x_mp.c
@@ -65,7 +65,7 @@ static int init_mp_priv(struct mp_priv *pmp_priv)
                         ((addr_t)(pmp_priv->pallocated_mp_xmitframe_buf) & 3);
        pmp_xmitframe = (struct mp_xmit_frame *)pmp_priv->pmp_xmtframe_buf;
        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),
                                 &(pmp_priv->free_mp_xmitqueue.queue));
                pmp_xmitframe->pkt = NULL;

diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index eb775872c93cf3723ba2a86b3bdabd73661f9787..269c8722aa69da60661761e98580a606bc17fc91 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -86,7 +86,7 @@ sint _r8712_init_recv_priv(struct recv_priv *precvpriv,
                                    (RXFRAME_ALIGN_SZ-1));
        precvframe = (union recv_frame *)precvpriv->precv_frame_buf;
        for (i = 0; i < NR_RECVFRAME; i++) {
-               _init_listhead(&(precvframe->u.list));
+               INIT_LIST_HEAD(&(precvframe->u.list));
                list_insert_tail(&(precvframe->u.list),
                                 &(precvpriv->free_recv_queue.queue));
                r8712_os_recv_resource_alloc(padapter, precvframe);

diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 6c649842abd74eaa7f932854ec45154e0f0768d0..8dd5e35630ef650420121754cae11e564e45d5ee 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -38,12 +38,12 @@ static void _init_stainfo(struct sta_info *psta)
 {
        memset((u8 *)psta, 0, sizeof(struct sta_info));
         spin_lock_init(&psta->lock);
-       _init_listhead(&psta->list);
-       _init_listhead(&psta->hash_list);
+       INIT_LIST_HEAD(&psta->list);
+       INIT_LIST_HEAD(&psta->hash_list);
        _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv);
        _r8712_init_sta_recv_priv(&psta->sta_recvpriv);
-       _init_listhead(&psta->asoc_list);
-       _init_listhead(&psta->auth_list);
+       INIT_LIST_HEAD(&psta->asoc_list);
+       INIT_LIST_HEAD(&psta->auth_list);
 }
 
 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);
        for (i = 0; i < NUM_STA; i++) {
                _init_stainfo(psta);
-               _init_listhead(&(pstapriv->sta_hash[i]));
+               INIT_LIST_HEAD(&(pstapriv->sta_hash[i]));
                list_insert_tail(&psta->list,
                                 get_list_head(&pstapriv->free_sta_queue));
                psta++;
        }
-       _init_listhead(&pstapriv->asoc_list);
-       _init_listhead(&pstapriv->auth_list);
+       INIT_LIST_HEAD(&pstapriv->asoc_list);
+       INIT_LIST_HEAD(&pstapriv->auth_list);
        return _SUCCESS;
 }
 

diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index 230681a8042f1fae3281b618881e805ce59d9819..68bfab0f7dd1eceb471e1016adf89e550583f345 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -43,7 +43,7 @@ static void free_hwxmits(struct _adapter *padapter);
 
 static void _init_txservq(struct tx_servq *ptxservq)
 {
-       _init_listhead(&ptxservq->tx_pending);
+       INIT_LIST_HEAD(&ptxservq->tx_pending);
        _init_queue(&ptxservq->sta_pending);
        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->vi_q);
        _init_txservq(&psta_xmitpriv->vo_q);
-       _init_listhead(&psta_xmitpriv->legacy_dz);
-       _init_listhead(&psta_xmitpriv->apsd);
+       INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz);
+       INIT_LIST_HEAD(&psta_xmitpriv->apsd);
 }
 
 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);
        pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf;
        for (i = 0; i < NR_XMITFRAME; i++) {
-               _init_listhead(&(pxframe->list));
+               INIT_LIST_HEAD(&(pxframe->list));
                pxframe->padapter = padapter;
                pxframe->frame_tag = DATA_FRAMETAG;
                pxframe->pkt = NULL;
@@ -134,7 +134,7 @@ sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv,
                              ((addr_t)(pxmitpriv->pallocated_xmitbuf) & 3);
        pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
        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,
                                                   GFP_ATOMIC);
                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++) {
                spin_lock_init(&phwxmit->xmit_lock);
-               _init_listhead(&phwxmit->pending);
+               INIT_LIST_HEAD(&phwxmit->pending);
                phwxmit->txcmdcnt = 0;
                phwxmit->accnt = 0;
        }