rtl8188eu: Convert typedef for _lock to spinlock_t

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-24 15:00:47 -05:00
parent 5f133c3764
commit 7b01fe6191
10 changed files with 27 additions and 30 deletions

View file

@ -334,7 +334,7 @@ struct _ADAPTER{
struct mutex *hw_init_mutex;
_lock br_ext_lock;
spinlock_t br_ext_lock;
struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE];
int pppoe_connection_in_progress;
unsigned char pppoe_addr[MACADDRLEN];

View file

@ -44,7 +44,7 @@ struct rtw_wdev_priv
_adapter *padapter;
struct cfg80211_scan_request *scan_request;
_lock scan_req_lock;
spinlock_t scan_req_lock;
struct net_device *pmon_ndev;//for monitor interface
char ifname_mon[IFNAMSIZ + 1]; //interface name for monitor interface

View file

@ -69,12 +69,11 @@
#include <linux/usb/ch9.h>
#endif
typedef spinlock_t _lock;
typedef struct timer_list _timer;
struct __queue {
struct list_head queue;
_lock lock;
spinlock_t lock;
};
typedef struct sk_buff _pkt;
@ -132,32 +131,32 @@ __inline static _list *get_list_head(_queue *queue)
((type *)((char *)(ptr)-(size_t)(&((type *)0)->member)))
__inline static void _enter_critical(_lock *plock, unsigned long *pirqL)
__inline static void _enter_critical(spinlock_t *plock, unsigned long *pirqL)
{
spin_lock_irqsave(plock, *pirqL);
}
__inline static void _exit_critical(_lock *plock, unsigned long *pirqL)
__inline static void _exit_critical(spinlock_t *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
__inline static void _enter_critical_ex(_lock *plock, unsigned long *pirqL)
__inline static void _enter_critical_ex(spinlock_t *plock, unsigned long *pirqL)
{
spin_lock_irqsave(plock, *pirqL);
}
__inline static void _exit_critical_ex(_lock *plock, unsigned long *pirqL)
__inline static void _exit_critical_ex(spinlock_t *plock, unsigned long *pirqL)
{
spin_unlock_irqrestore(plock, *pirqL);
}
__inline static void _enter_critical_bh(_lock *plock, unsigned long *pirqL)
__inline static void _enter_critical_bh(spinlock_t *plock, unsigned long *pirqL)
{
spin_lock_bh(plock);
}
__inline static void _exit_critical_bh(_lock *plock, unsigned long *pirqL)
__inline static void _exit_critical_bh(spinlock_t *plock, unsigned long *pirqL)
{
spin_unlock_bh(plock);
}
@ -384,8 +383,8 @@ extern void _rtw_up_sema(struct semaphore *sema);
extern u32 _rtw_down_sema(struct semaphore *sema);
extern void _rtw_mutex_init(struct mutex *pmutex);
extern void _rtw_mutex_free(struct mutex *pmutex);
extern void _rtw_spinlock_init(_lock *plock);
extern void _rtw_spinlock_free(_lock *plock);
extern void _rtw_spinlock_init(spinlock_t *plock);
extern void _rtw_spinlock_free(spinlock_t *plock);
extern void _rtw_init_queue(_queue *pqueue);
extern u32 _rtw_queue_empty(_queue *pqueue);

View file

@ -410,7 +410,6 @@ typedef struct hal_data_8188e
struct dm_priv dmpriv;
DM_ODM_T odmpriv;
//_lock odm_stainfo_lock;
struct sreset_priv srestpriv;
#ifdef CONFIG_BT_COEXIST

View file

@ -31,7 +31,6 @@
#include <linux/semaphore.h>
#endif
#include <linux/list.h>
//#include <linux/smp_lock.h>
#include <linux/spinlock.h>
#include <asm/atomic.h>
@ -290,7 +289,7 @@ Below is the data structure used by _io_handler
*/
struct io_queue {
_lock lock;
spinlock_t lock;
_list free_ioreqs;
_list pending; //The io_req list that will be served in the single protocol read/write.
_list processing;

View file

@ -281,8 +281,8 @@ struct tdls_info{
u8 cur_channel;
u8 candidate_ch;
u8 collect_pkt_num[MAX_CHANNEL_NUM];
_lock cmd_lock;
_lock hdl_lock;
spinlock_t cmd_lock;
spinlock_t hdl_lock;
u8 watchdog_count;
u8 dev_discovered; //WFD_TDLS: for sigma test
u8 enable;
@ -290,7 +290,7 @@ struct tdls_info{
struct mlme_priv {
_lock lock;
spinlock_t lock;
sint fw_state; //shall we protect this variable? maybe not necessarily...
u8 bScanInProcess;
u8 to_join; //flag
@ -406,7 +406,7 @@ struct mlme_priv {
u32 p2p_probe_resp_ie_len;
u32 p2p_go_probe_resp_ie_len; //for GO
u32 p2p_assoc_req_ie_len;
_lock bcn_update_lock;
spinlock_t bcn_update_lock;
u8 update_bcn;
#endif //#if defined (CONFIG_AP_MODE)
};

View file

@ -192,7 +192,7 @@ using enter_critical section to protect
*/
struct recv_priv
{
_lock lock;
spinlock_t lock;
_queue free_recv_queue;
_queue recv_pending_queue;
_queue uc_swdec_pending_queue;
@ -244,7 +244,7 @@ struct recv_priv
struct sta_recv_priv {
_lock lock;
spinlock_t lock;
sint option;
//_queue blk_strms[MAX_RX_NUMBLKS];
@ -263,7 +263,7 @@ struct recv_buf
{
_list list;
_lock recvbuf_lock;
spinlock_t recvbuf_lock;
u32 ref_cnt;

View file

@ -253,7 +253,7 @@ struct tx_servq {
struct sta_xmit_priv
{
_lock lock;
spinlock_t lock;
sint option;
sint apsd_setting; //When bit mask is on, the associated edca queue supports APSD.
@ -294,7 +294,7 @@ struct agg_pkt_info{
struct xmit_priv {
_lock lock;
spinlock_t lock;
struct semaphore xmit_sema;
struct semaphore terminate_xmitthread_sema;

View file

@ -86,7 +86,7 @@ struct stainfo_stats {
struct sta_info {
_lock lock;
spinlock_t lock;
_list list; //free_sta_queue
_list hash_list; //sta_hash
//_list asoc_list; //20061114
@ -339,7 +339,7 @@ struct sta_priv {
u8 *pstainfo_buf;
_queue free_sta_queue;
_lock sta_hash_lock;
spinlock_t sta_hash_lock;
_list sta_hash[NUM_STA];
int asoc_sta_count;
_queue sleep_q;
@ -351,8 +351,8 @@ struct sta_priv {
#ifdef CONFIG_AP_MODE
_list asoc_list;
_list auth_list;
_lock asoc_list_lock;
_lock auth_list_lock;
spinlock_t asoc_list_lock;
spinlock_t auth_list_lock;
u8 asoc_list_cnt;
u8 auth_list_cnt;

View file

@ -215,12 +215,12 @@ void _rtw_mutex_free(struct mutex *pmutex)
#endif
}
void _rtw_spinlock_init(_lock *plock)
void _rtw_spinlock_init(spinlock_t *plock)
{
spin_lock_init(plock);
}
void _rtw_spinlock_free(_lock *plock)
void _rtw_spinlock_free(spinlock_t *plock)
{
}