From 32c09fed58df67667b005c1e993baf1e532c47cc Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 27 Feb 2015 20:21:19 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC This symbol is always defined. Signed-off-by: Larry Finger --- hal/usb_ops_linux.c | 14 -------------- include/autoconf.h | 6 ------ include/drv_types.h | 6 ++---- os_dep/usb_intf.c | 6 ------ 4 files changed, 2 insertions(+), 30 deletions(-) diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 82bff6f..c4e3b73 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -62,21 +62,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); /* Acquire IO memory for vendorreq */ -#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC pIo_buf = pdvobjpriv->usb_vendor_req_buf; -#else - #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE - tmp_buf = rtw_malloc( (u32) len + ALIGNMENT_UNIT); - tmp_buflen = (u32)len + ALIGNMENT_UNIT; - #else /* use stack memory */ - tmp_buflen = MAX_USB_IO_CTL_SIZE; - #endif - - /* Added by Albert 2010/02/09 */ - /* For mstar platform, mstar suggests the address for USB IO should be 16 bytes alignment. */ - /* Trying to fix it here. */ - pIo_buf = (tmp_buf==NULL)?NULL:tmp_buf + ALIGNMENT_UNIT -((SIZE_PTR)(tmp_buf) & 0x0f ); -#endif if ( pIo_buf== NULL) { DBG_8192C( "[%s] pIo_buf == NULL \n", __FUNCTION__ ); diff --git a/include/autoconf.h b/include/autoconf.h index 0e2f9bd..d0e7fbe 100755 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -76,12 +76,6 @@ #define CONFIG_BR_EXT_BRNAME "br0" #endif // CONFIG_BR_EXT -/* - * USB VENDOR REQ BUFFER ALLOCATION METHOD - * if not set we'll use function local variable (stack memory) - */ -#define CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC - /* * HAL Related Config */ diff --git a/include/drv_types.h b/include/drv_types.h index a960272..ccd0ffb 100755 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -274,10 +274,8 @@ struct dvobj_priv _mutex usb_vendor_req_mutex; -#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC - u8 * usb_alloc_vendor_req_buf; - u8 * usb_vendor_req_buf; -#endif + u8 *usb_alloc_vendor_req_buf; + u8 *usb_vendor_req_buf; struct usb_interface *pusbintf; struct usb_device *pusbdev; diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 67c0cc3..841d6e4 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -228,7 +228,6 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj) _rtw_mutex_init(&dvobj->usb_vendor_req_mutex); - #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); if (dvobj->usb_alloc_vendor_req_buf == NULL) { DBG_871X("alloc usb_vendor_req_buf failed... /n"); @@ -238,20 +237,15 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj) dvobj->usb_vendor_req_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(dvobj->usb_alloc_vendor_req_buf ), ALIGNMENT_UNIT); exit: - #endif - return rst; - } static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj) { u8 rst = _SUCCESS; - #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC if(dvobj->usb_vendor_req_buf) rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); - #endif _rtw_mutex_free(&dvobj->usb_vendor_req_mutex);