skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-02-08 15:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_MUTEX

Browse source 
This symbol is always defined.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-25 22:07:13 -06:00
parent f6fb81d6a0
commit ad60073d21
6 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hal/usb_ops_linux.c
View file

@ -59,10 +59,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
goto exit; goto exit;
} }
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
#endif
/* Acquire IO memory for vendorreq */ /* Acquire IO memory for vendorreq */
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
@ -159,9 +156,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
#endif #endif
release_mutex: release_mutex:
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); _exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
#endif
exit: exit:
return status; return status;

1
include/autoconf.h
View file

@ -105,7 +105,6 @@
*/ */
#define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
#define CONFIG_USB_VENDOR_REQ_MUTEX
#define CONFIG_VENDOR_REQ_RETRY #define CONFIG_VENDOR_REQ_RETRY
/* /*

13
include/drv_conf.h
View file

@ -55,17 +55,4 @@
#endif #endif
#endif #endif
//About USB VENDOR REQ
#if defined(CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC automatically"
#define CONFIG_USB_VENDOR_REQ_MUTEX
#endif
#if defined(CONFIG_VENDOR_REQ_RETRY) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX)
#warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_VENDOR_REQ_RETRY automatically"
#define CONFIG_USB_VENDOR_REQ_MUTEX
#endif
//#include <rtl871x_byteorder.h>
#endif // __DRV_CONF_H__ #endif // __DRV_CONF_H__

2
include/drv_types.h
View file

@ -274,9 +274,7 @@ struct dvobj_priv
_sema usb_suspend_sema; _sema usb_suspend_sema;
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_mutex usb_vendor_req_mutex; _mutex usb_vendor_req_mutex;
#endif
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
u8 * usb_alloc_vendor_req_buf; u8 * usb_alloc_vendor_req_buf;

2
include/usb_ops_linux.h
View file

@ -25,7 +25,7 @@
#define RTW_USB_CONTROL_MSG_TIMEOUT_TEST 10//ms #define RTW_USB_CONTROL_MSG_TIMEOUT_TEST 10//ms
#define RTW_USB_CONTROL_MSG_TIMEOUT 500//ms #define RTW_USB_CONTROL_MSG_TIMEOUT 500//ms
#if defined(CONFIG_VENDOR_REQ_RETRY) && defined(CONFIG_USB_VENDOR_REQ_MUTEX) #if defined(CONFIG_VENDOR_REQ_RETRY)
/* vendor req retry should be in the situation when each vendor req is atomically submitted from others */ /* vendor req retry should be in the situation when each vendor req is atomically submitted from others */
#define MAX_USBCTRL_VENDORREQ_TIMES 10 #define MAX_USBCTRL_VENDORREQ_TIMES 10
#else #else

5
os_dep/usb_intf.c
View file

@ -226,10 +226,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
{ {
u8 rst = _SUCCESS; u8 rst = _SUCCESS;
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_rtw_mutex_init(&dvobj->usb_vendor_req_mutex); _rtw_mutex_init(&dvobj->usb_vendor_req_mutex);
#endif
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
@ -256,9 +253,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE);
#endif #endif
#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
_rtw_mutex_free(&dvobj->usb_vendor_req_mutex); _rtw_mutex_free(&dvobj->usb_vendor_req_mutex);
#endif
return rst; return rst;
} }