redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: r8188eu: Remove wrapper around spin_lock_init

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Larry Finger 2013-12-19 22:38:38 -06:00 committed by Greg Kroah-Hartman
parent 597794f53e
commit f214e521d9
9 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/rtl8188eu/core/rtw_ap.c
View file

@ -33,7 +33,7 @@ void init_mlme_ap_info(struct adapter *padapter)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_rtw_spinlock_init(&pmlmepriv->bcn_update_lock); spin_lock_init(&pmlmepriv->bcn_update_lock);
/* for ACL */ /* for ACL */
_rtw_init_queue(&pacl_list->acl_node_q); _rtw_init_queue(&pacl_list->acl_node_q);

2
drivers/staging/rtl8188eu/core/rtw_mlme.c
View file

@ -54,7 +54,7 @@ _func_enter_;
pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown;
pmlmepriv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ pmlmepriv->scan_mode = SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */
_rtw_spinlock_init(&(pmlmepriv->lock)); spin_lock_init(&(pmlmepriv->lock));
_rtw_init_queue(&(pmlmepriv->free_bss_pool)); _rtw_init_queue(&(pmlmepriv->free_bss_pool));
_rtw_init_queue(&(pmlmepriv->scanned_queue)); _rtw_init_queue(&(pmlmepriv->scanned_queue));

4
drivers/staging/rtl8188eu/core/rtw_recv.c
View file

@ -49,7 +49,7 @@ _func_enter_;
_rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv)); _rtw_memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv));
_rtw_spinlock_init(&psta_recvpriv->lock); spin_lock_init(&psta_recvpriv->lock);
_rtw_init_queue(&psta_recvpriv->defrag_q); _rtw_init_queue(&psta_recvpriv->defrag_q);
@ -65,7 +65,7 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
int res = _SUCCESS; int res = _SUCCESS;
_func_enter_; _func_enter_;
_rtw_spinlock_init(&precvpriv->lock); spin_lock_init(&precvpriv->lock);
_rtw_init_queue(&precvpriv->free_recv_queue); _rtw_init_queue(&precvpriv->free_recv_queue);
_rtw_init_queue(&precvpriv->recv_pending_queue); _rtw_init_queue(&precvpriv->recv_pending_queue);

8
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
View file

@ -31,7 +31,7 @@ static void _rtw_init_stainfo(struct sta_info *psta)
_func_enter_; _func_enter_;
_rtw_memset((u8 *)psta, 0, sizeof (struct sta_info)); _rtw_memset((u8 *)psta, 0, sizeof (struct sta_info));
_rtw_spinlock_init(&psta->lock); spin_lock_init(&psta->lock);
_rtw_init_listhead(&psta->list); _rtw_init_listhead(&psta->list);
_rtw_init_listhead(&psta->hash_list); _rtw_init_listhead(&psta->hash_list);
_rtw_init_queue(&psta->sleep_q); _rtw_init_queue(&psta->sleep_q);
@ -89,7 +89,7 @@ _func_enter_;
_rtw_init_queue(&pstapriv->free_sta_queue); _rtw_init_queue(&pstapriv->free_sta_queue);
_rtw_spinlock_init(&pstapriv->sta_hash_lock); spin_lock_init(&pstapriv->sta_hash_lock);
pstapriv->asoc_sta_count = 0; pstapriv->asoc_sta_count = 0;
_rtw_init_queue(&pstapriv->sleep_q); _rtw_init_queue(&pstapriv->sleep_q);
@ -114,8 +114,8 @@ _func_enter_;
_rtw_init_listhead(&pstapriv->asoc_list); _rtw_init_listhead(&pstapriv->asoc_list);
_rtw_init_listhead(&pstapriv->auth_list); _rtw_init_listhead(&pstapriv->auth_list);
_rtw_spinlock_init(&pstapriv->asoc_list_lock); spin_lock_init(&pstapriv->asoc_list_lock);
_rtw_spinlock_init(&pstapriv->auth_list_lock); spin_lock_init(&pstapriv->auth_list_lock);
pstapriv->asoc_list_cnt = 0; pstapriv->asoc_list_cnt = 0;
pstapriv->auth_list_cnt = 0; pstapriv->auth_list_cnt = 0;

4
drivers/staging/rtl8188eu/core/rtw_xmit.c
View file

@ -43,7 +43,7 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
{ {
_func_enter_; _func_enter_;
_rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv)); _rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv));
_rtw_spinlock_init(&psta_xmitpriv->lock); spin_lock_init(&psta_xmitpriv->lock);
_init_txservq(&psta_xmitpriv->be_q); _init_txservq(&psta_xmitpriv->be_q);
_init_txservq(&psta_xmitpriv->bk_q); _init_txservq(&psta_xmitpriv->bk_q);
_init_txservq(&psta_xmitpriv->vi_q); _init_txservq(&psta_xmitpriv->vi_q);
@ -67,7 +67,7 @@ _func_enter_;
/* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
_rtw_spinlock_init(&pxmitpriv->lock); spin_lock_init(&pxmitpriv->lock);
_rtw_init_sema(&pxmitpriv->xmit_sema, 0); _rtw_init_sema(&pxmitpriv->xmit_sema, 0);
_rtw_init_sema(&pxmitpriv->terminate_xmitthread_sema, 0); _rtw_init_sema(&pxmitpriv->terminate_xmitthread_sema, 0);

2
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
View file

@ -75,7 +75,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter)
for (i = 0; i < NR_RECVBUFF; i++) { for (i = 0; i < NR_RECVBUFF; i++) {
_rtw_init_listhead(&precvbuf->list); _rtw_init_listhead(&precvbuf->list);
_rtw_spinlock_init(&precvbuf->recvbuf_lock); spin_lock_init(&precvbuf->recvbuf_lock);
precvbuf->alloc_sz = MAX_RECVBUF_SZ; precvbuf->alloc_sz = MAX_RECVBUF_SZ;
res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf); res = rtw_os_recvbuf_resource_alloc(padapter, precvbuf);
if (res == _FAIL) if (res == _FAIL)

1
drivers/staging/rtl8188eu/include/osdep_service.h
View file

@ -262,7 +262,6 @@ void _rtw_up_sema(struct semaphore *sema);
u32 _rtw_down_sema(struct semaphore *sema); u32 _rtw_down_sema(struct semaphore *sema);
void _rtw_mutex_init(struct mutex *pmutex); void _rtw_mutex_init(struct mutex *pmutex);
void _rtw_mutex_free(struct mutex *pmutex); void _rtw_mutex_free(struct mutex *pmutex);
void _rtw_spinlock_init(spinlock_t *plock);
void _rtw_spinlock_free(spinlock_t *plock); void _rtw_spinlock_free(spinlock_t *plock);
void _rtw_init_queue(struct __queue *pqueue); void _rtw_init_queue(struct __queue *pqueue);

2
drivers/staging/rtl8188eu/os_dep/os_intfs.c
View file

@ -924,7 +924,7 @@ _func_enter_;
rtw_hal_sreset_init(padapter); rtw_hal_sreset_init(padapter);
_rtw_spinlock_init(&padapter->br_ext_lock); spin_lock_init(&padapter->br_ext_lock);
exit: exit:
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_init_drv_sw\n"));

7
drivers/staging/rtl8188eu/os_dep/osdep_service.c
View file

@ -193,11 +193,6 @@ void _rtw_mutex_free(struct mutex *pmutex)
mutex_destroy(pmutex); mutex_destroy(pmutex);
} }
void _rtw_spinlock_init(spinlock_t *plock)
{
spin_lock_init(plock);
}
void _rtw_spinlock_free(spinlock_t *plock) void _rtw_spinlock_free(spinlock_t *plock)
{ {
} }
@ -205,7 +200,7 @@ void _rtw_spinlock_free(spinlock_t *plock)
void _rtw_init_queue(struct __queue *pqueue) void _rtw_init_queue(struct __queue *pqueue)
{ {
_rtw_init_listhead(&(pqueue->queue)); _rtw_init_listhead(&(pqueue->queue));
_rtw_spinlock_init(&(pqueue->lock)); spin_lock_init(&(pqueue->lock));
} }
u32 _rtw_queue_empty(struct __queue *pqueue) u32 _rtw_queue_empty(struct __queue *pqueue)