rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_MUTEX - not selected

This change made include/drv_conf.h and core/rtw_ioctl_query.c redundant.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Makefile

@@ -139,7 +139,6 @@ rtk_core :=				\
 		core/rtw_efuse.o	\
 		core/rtw_ieee80211.o	\
 		core/rtw_io.o		\
-		core/rtw_ioctl_query.o	\
 		core/rtw_ioctl_set.o	\
 		core/rtw_iol.o		\
 		core/rtw_led.o		\

core/rtw_ap.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_AP_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

core/rtw_br_ext.c

@@ -28,7 +28,6 @@
 #include <linux/if_pppox.h>
 #endif
 
-#include <drv_conf.h>
 #include <drv_types.h>
 #include "rtw_br_ext.h"
 #include <usb_osintf.h>

core/rtw_cmd.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_CMD_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

core/rtw_efuse.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_EFUSE_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_efuse.h>

core/rtw_io.c

@@ -40,7 +40,6 @@ jackson@realtek.com.tw
 */
 
 #define _RTW_IO_C_
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_io.h>

core/rtw_ioctl_query.c

@@ -1,26 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-#define _RTW_IOCTL_QUERY_C_
-
-#include <drv_conf.h>
-#include <osdep_service.h>
-#include <drv_types.h>
-#include <rtw_ioctl_query.h>
-#include <wifi.h>

core/rtw_ioctl_set.c

@@ -20,7 +20,6 @@
 #define _RTW_IOCTL_SET_C_
 
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_ioctl_set.h>

core/rtw_mlme.c

@@ -20,7 +20,6 @@
 #define _RTW_MLME_C_
 
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

core/rtw_mlme_ext.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_MLME_EXT_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

core/rtw_mp_ioctl.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_MP_IOCTL_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <mlme_osdep.h>

core/rtw_pwrctrl.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_PWRCTRL_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <osdep_intf.h>

core/rtw_recv.c

@@ -18,7 +18,7 @@
  *
  ******************************************************************************/
 #define _RTW_RECV_C_
-#include <drv_conf.h>
+
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

core/rtw_rf.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_RF_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

core/rtw_security.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define  _RTW_SECURITY_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

core/rtw_sta_mgt.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_STA_MGT_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

core/rtw_wlan_util.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_WLAN_UTIL_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

core/rtw_xmit.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_XMIT_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

hal/hal_com.c

@@ -17,7 +17,6 @@
  *
  *
  ******************************************************************************/
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

hal/hal_intf.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 
 #define _HAL_INTF_C_
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <hal_intf.h>

hal/rtl8188e_cmd.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTL8188E_CMD_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

hal/rtl8188e_dm.c

@@ -29,7 +29,6 @@
 /*  */
 /*  include files */
 /*  */
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

hal/rtl8188e_phycfg.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTL8188E_PHYCFG_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_iol.h>

hal/rtl8188e_rf6052.c

@@ -41,7 +41,6 @@
 
 #define _RTL8188E_RF6052_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

hal/rtl8188e_rxdesc.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTL8188E_REDESC_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtl8188e_hal.h>

hal/rtl8188e_xmit.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTL8188E_XMIT_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtl8188e_hal.h>

hal/rtl8188eu_led.c

@@ -18,7 +18,6 @@
  *
  ******************************************************************************/
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtl8188e_hal.h>

hal/rtl8188eu_recv.c

@@ -18,7 +18,6 @@
  *
  ******************************************************************************/
 #define _RTL8188EU_RECV_C_
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

hal/rtl8188eu_xmit.c

@@ -18,7 +18,6 @@
  *
  ******************************************************************************/
 #define _RTL8188E_XMIT_C_
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

hal/usb_halinit.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _HCI_HAL_INIT_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_efuse.h>

hal/usb_ops_linux.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _HCI_OPS_OS_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <osdep_intf.h>
@@ -59,10 +58,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 		goto exit;
 	}
 
-	#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
 	_enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
-	#endif
-
 
 	/*  Acquire IO memory for vendorreq */
 #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
@@ -157,12 +153,9 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
 	#endif
 
 release_mutex:
-	#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
 	_exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL);
-	#endif
 exit:
 	return status;
-
 }
 
 static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)

include/basic_types.h

@@ -20,9 +20,6 @@
 #ifndef __BASIC_TYPES_H__
 #define __BASIC_TYPES_H__
 
-#include <drv_conf.h>
-
-
 #define SUCCESS	0
 #define FAIL	(-1)
 

include/cmd_osdep.h

@@ -20,8 +20,6 @@
 #ifndef __CMD_OSDEP_H_
 #define __CMD_OSDEP_H_
 
-
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/drv_conf.h

@@ -1,34 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
- ******************************************************************************/
-#ifndef __DRV_CONF_H__
-#define __DRV_CONF_H__
-#include "autoconf.h"
-
-//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
-
-#endif // __DRV_CONF_H__

include/drv_types.h

@@ -27,7 +27,7 @@
 #ifndef __DRV_TYPES_H__
 #define __DRV_TYPES_H__
 
-#include <drv_conf.h>
+#include <autoconf.h>
 #include <osdep_service.h>
 #include <wlan_bssdef.h>
 #include <drv_types_linux.h>

include/hal_intf.h

@@ -20,7 +20,6 @@
 #ifndef __HAL_INTF_H__
 #define __HAL_INTF_H__
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <Hal8188EPhyCfg.h>

include/ieee80211.h

@@ -20,7 +20,6 @@
 #ifndef __IEEE80211_H
 #define __IEEE80211_H
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include "wifi.h"

include/ieee80211_ext.h

@@ -20,7 +20,6 @@
 #ifndef __IEEE80211_EXT_H
 #define __IEEE80211_EXT_H
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/mlme_osdep.h

@@ -20,7 +20,6 @@
 #ifndef	__MLME_OSDEP_H_
 #define __MLME_OSDEP_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/nic_spec.h

@@ -22,8 +22,6 @@
 #ifndef __NIC_SPEC_H__
 #define __NIC_SPEC_H__
 
-#include <drv_conf.h>
-
 #define RTL8711_MCTRL_		(0x20000)
 #define RTL8711_UART_		(0x30000)
 #define RTL8711_TIMER_		(0x40000)

include/odm_precomp.h

@@ -27,7 +27,6 @@
 
 //2 Config Flags and Structs - defined by each ODM Type
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <hal_intf.h>

include/osdep_intf.h

@@ -21,7 +21,6 @@
 #ifndef __OSDEP_INTF_H_
 #define __OSDEP_INTF_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/osdep_service.h

@@ -20,7 +20,6 @@
 #ifndef __OSDEP_SERVICE_H_
 #define __OSDEP_SERVICE_H_
 
-#include <drv_conf.h>
 #include <basic_types.h>
 
 #define _FAIL		0

include/recv_osdep.h

@@ -20,7 +20,6 @@
 #ifndef __RECV_OSDEP_H_
 #define __RECV_OSDEP_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtl8188e_led.h

@@ -20,7 +20,6 @@
 #ifndef __RTL8188E_LED_H__
 #define __RTL8188E_LED_H__
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtl8188e_spec.h

@@ -19,8 +19,6 @@
 #ifndef __RTL8188E_SPEC_H__
 #define __RTL8188E_SPEC_H__
 
-#include <drv_conf.h>
-
 #ifndef BIT
 #define BIT(x)		(1 << (x))
 #endif

include/rtl8188e_sreset.h

@@ -20,7 +20,6 @@
 #ifndef _RTL8188E_SRESET_H_
 #define _RTL8188E_SRESET_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <rtw_sreset.h>

include/rtw_ap.h

@@ -20,11 +20,9 @@
 #ifndef __RTW_AP_H_
 #define __RTW_AP_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 
-
 #ifdef CONFIG_AP_MODE
 
 //external function

include/rtw_cmd.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_CMD_H_
 #define __RTW_CMD_H_
 
-#include <drv_conf.h>
 #include <wlan_bssdef.h>
 #include <rtw_rf.h>
 #include <rtw_led.h>

include/rtw_debug.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_DEBUG_H__
 #define __RTW_DEBUG_H__
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_eeprom.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_EEPROM_H__
 #define __RTW_EEPROM_H__
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_efuse.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_EFUSE_H__
 #define __RTW_EFUSE_H__
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 
 #define	EFUSE_ERROE_HANDLE		1

include/rtw_event.h

@@ -19,7 +19,7 @@
  ******************************************************************************/
 #ifndef _RTW_EVENT_H_
 #define _RTW_EVENT_H_
-#include <drv_conf.h>
+
 #include <osdep_service.h>
 
 #include <wlan_bssdef.h>

include/rtw_ht.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_HT_H_
 #define _RTW_HT_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include "wifi.h"
 

include/rtw_io.h

@@ -21,7 +21,6 @@
 #ifndef _RTW_IO_H_
 #define _RTW_IO_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <osdep_intf.h>
 

include/rtw_ioctl.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_IOCTL_H_
 #define _RTW_IOCTL_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_ioctl_query.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_IOCTL_QUERY_H_
 #define _RTW_IOCTL_QUERY_H_
 
-#include <drv_conf.h>
 #include <drv_types.h>
 
 #endif

include/rtw_ioctl_rtl.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_IOCTL_RTL_H_
 #define _RTW_IOCTL_RTL_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_ioctl_set.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_IOCTL_SET_H_
 #define __RTW_IOCTL_SET_H_
 
-#include <drv_conf.h>
 #include <drv_types.h>
 
 

include/rtw_iol.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_IOL_H_
 #define __RTW_IOL_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 struct xmit_frame	*rtw_IOL_accquire_xmit_frame(ADAPTER *adapter);

include/rtw_led.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_LED_H_
 #define __RTW_LED_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_mlme.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_MLME_H_
 #define __RTW_MLME_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <mlme_osdep.h>
 #include <drv_types.h>

include/rtw_mlme_ext.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_MLME_EXT_H_
 #define __RTW_MLME_EXT_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wlan_bssdef.h>

include/rtw_mp_ioctl.h

@@ -20,8 +20,6 @@
 #ifndef _RTW_MP_IOCTL_H_
 #define _RTW_MP_IOCTL_H_
 
-//#include <drv_conf.h>
-//#include <osdep_service.h>
 #include <drv_types.h>
 #include <mp_custom_oid.h>
 #include <rtw_ioctl.h>

include/rtw_pwrctrl.h

@@ -20,7 +20,6 @@
 #ifndef __RTW_PWRCTRL_H_
 #define __RTW_PWRCTRL_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_qos.h

@@ -17,23 +17,13 @@
  *
  *
  ******************************************************************************/
-
-
 #ifndef _RTW_QOS_H_
 #define _RTW_QOS_H_
-#include <drv_conf.h>
+
 #include <osdep_service.h>
 
-
-
-
-
-
 struct	qos_priv	{
-
 	unsigned int	  qos_option;	//bit mask option: u-apsd, s-apsd, ts, block ack...
-
 };
 
-
 #endif	//_RTL871X_QOS_H_

include/rtw_recv.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_RECV_H_
 #define _RTW_RECV_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_rf.h

@@ -20,7 +20,6 @@
 #ifndef	__RTW_RF_H_
 #define __RTW_RF_H_
 
-#include <drv_conf.h>
 #include <rtw_cmd.h>
 
 #define OFDM_PHY		1

include/rtw_security.h

@@ -20,12 +20,9 @@
 #ifndef __RTW_SECURITY_H_
 #define __RTW_SECURITY_H_
 
-
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 
-
 #define _NO_PRIVACY_		0x0
 #define _WEP40_				0x1
 #define _TKIP_				0x2

include/rtw_sreset.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_SRESET_C_
 #define _RTW_SRESET_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/rtw_xmit.h

@@ -20,7 +20,6 @@
 #ifndef _RTW_XMIT_H_
 #define _RTW_XMIT_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

include/sta_info.h

@@ -20,7 +20,6 @@
 #ifndef __STA_INFO_H_
 #define __STA_INFO_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wifi.h>

include/usb_ops.h

@@ -20,7 +20,6 @@
 #ifndef __USB_OPS_H_
 #define __USB_OPS_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <osdep_intf.h>

include/usb_osintf.h

@@ -20,7 +20,6 @@
 #ifndef __USB_OSINTF_H
 #define __USB_OSINTF_H
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <usb_vendor_req.h>

include/xmit_osdep.h

@@ -20,7 +20,6 @@
 #ifndef __XMIT_OSDEP_H_
 #define __XMIT_OSDEP_H_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

os_dep/ioctl_linux.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _IOCTL_LINUX_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <wlan_bssdef.h>

os_dep/mlme_linux.c

@@ -21,7 +21,6 @@
 
 #define _MLME_OSDEP_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <mlme_osdep.h>

os_dep/os_intfs.c

@@ -19,8 +19,6 @@
  ******************************************************************************/
 #define _OS_INTFS_C_
 
-#include <drv_conf.h>
-
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <xmit_osdep.h>

os_dep/osdep_service.c

@@ -21,7 +21,6 @@
 
 #define _OSDEP_SERVICE_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>

os_dep/recv_linux.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RECV_OSDEP_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 

os_dep/usb_intf.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _HCI_INTF_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>
@@ -200,10 +199,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
 {
 	u8 rst = _SUCCESS;
 
-	#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
 	_rtw_mutex_init(&dvobj->usb_vendor_req_mutex);
-	#endif
-
 
 	#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
 	dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
@@ -230,9 +226,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
 		rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE);
 	#endif
 
-	#ifdef CONFIG_USB_VENDOR_REQ_MUTEX
 	_rtw_mutex_free(&dvobj->usb_vendor_req_mutex);
-	#endif
 
 	return rst;
 }

os_dep/xmit_linux.c

@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _XMIT_OSDEP_C_
 
-#include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>