rtl8188eu: Remove dead code for devices other than RTL8188EU

This commit handles files in include/.

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

include/drv_conf.h

@@ -272,27 +272,6 @@
 #define MACID_NUM_SW_LIMIT 32
 #define SEC_CAM_ENT_NUM_SW_LIMIT 32
 
-#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8814A)
-	#define CONFIG_IEEE80211_BAND_5GHZ
-#endif
-
-#if defined(CONFIG_WOWLAN) && (defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C))
-	#define CONFIG_WOW_PATTERN_HW_CAM
-#endif
-
-/*
-	Mark CONFIG_DEAUTH_BEFORE_CONNECT by Arvin 2015/07/20
-	If the failure of Wi-Fi connection is due to some irregular disconnection behavior (like unplug dongle,
-	power down etc.) in last time, we can unmark this flag to avoid some unpredictable response from AP.
-*/
-/*#define CONFIG_DEAUTH_BEFORE_CONNECT */
-
-/*#define CONFIG_WEXT_DONT_JOIN_BYSSID	*/
-/* #include <rtl871x_byteorder.h> */
-
-
-/*#define CONFIG_DOSCAN_IN_BUSYTRAFFIC	*/
-
 /*Don't release SDIO irq in suspend/resume procedure*/
 #define CONFIG_RTW_SDIO_KEEP_IRQ	0
 

include/hal_com_reg.h

@@ -1807,11 +1807,7 @@ Current IOREG MAP
 #define LAST_ENTRY_OF_TX_PKT_BUFFER_8723D		255
 
 #define POLLING_LLT_THRESHOLD				20
-#if defined(CONFIG_RTL8723B) && defined(CONFIG_PCI_HCI)
+#define POLLING_READY_TIMEOUT_COUNT		1000
-	#define POLLING_READY_TIMEOUT_COUNT		6000
-#else
-	#define POLLING_READY_TIMEOUT_COUNT		1000
-#endif
 
 
 /* GPIO BIT */

include/hal_data.h

@@ -124,38 +124,9 @@ typedef enum _RX_AGG_MODE {
 #endif /* RTW_RX_AGGREGATION */
 
 /* E-Fuse */
-#ifdef CONFIG_RTL8188E
+#define EFUSE_MAP_SIZE	512
-	#define EFUSE_MAP_SIZE	512
-#endif
-#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8814A)
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8192E
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8723B
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8814A
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8703B
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8723D
-	#define EFUSE_MAP_SIZE	512
-#endif
-#ifdef CONFIG_RTL8188F
-	#define EFUSE_MAP_SIZE	512
-#endif
 
-#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
+#define EFUSE_MAX_SIZE	256
-	#define EFUSE_MAX_SIZE	1024
-#elif defined(CONFIG_RTL8188E) || defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8703B)
-	#define EFUSE_MAX_SIZE	256
-#else
-	#define EFUSE_MAX_SIZE	512
-#endif
 /* end of E-Fuse */
 
 #define Mac_OFDM_OK			0x00000000
@@ -169,19 +140,6 @@ typedef enum _RX_AGG_MODE {
 #define Mac_HT_FasleAlarm	0x90000000
 #define Mac_DropPacket		0xA0000000
 
-#ifdef CONFIG_RF_POWER_TRIM
-#if defined(CONFIG_RTL8723B)
-	#define REG_RF_BB_GAIN_OFFSET	0x7f
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#elif defined(CONFIG_RTL8188E)
-	#define REG_RF_BB_GAIN_OFFSET	0x55
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#else
-	#define REG_RF_BB_GAIN_OFFSET	0x55
-	#define RF_GAIN_OFFSET_MASK		0xfffff
-#endif /* CONFIG_RTL8723B */
-#endif /*CONFIG_RF_POWER_TRIM*/
-
 /* For store initial value of BB register */
 typedef struct _BB_INIT_REGISTER {
 	u16	offset;
@@ -386,11 +344,6 @@ typedef struct hal_com_data {
 	struct kfree_data_t kfree_data;
 #endif /*CONFIG_RF_POWER_TRIM*/
 
-#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) || \
-	defined(CONFIG_RTL8723D)
-	u8	adjuseVoltageVal;
-	u8	need_restore;
-#endif
 	u8	EfuseUsedPercentage;
 	u16	EfuseUsedBytes;
 	/*u8		EfuseMap[2][HWSET_MAX_SIZE_JAGUAR];*/
@@ -617,17 +570,6 @@ typedef struct hal_com_data {
 
 #ifndef RTW_HALMAC
 	u32			sdio_tx_max_len[SDIO_MAX_TX_QUEUE];/* H, N, L, used for sdio tx aggregation max length per queue */
-#else
-#ifdef CONFIG_RTL8821C
-	u16			tx_high_page;
-	u16			tx_low_page;
-	u16			tx_normal_page;
-	u16			tx_extra_page;
-	u16			tx_pub_page;
-	u16			max_oqt_page;
-	u32			max_xmit_size_vovi;
-	u32			max_xmit_size_bebk;
-#endif
 #endif /* !RTW_HALMAC */
 #endif /* CONFIG_SDIO_HCI */
 
@@ -692,15 +634,6 @@ typedef struct hal_com_data {
 	BT_COEXIST		bt_coexist;
 #endif /* CONFIG_BT_COEXIST */
 
-#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8703B) \
-	|| defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8723D)
-#ifndef CONFIG_PCI_HCI	/* mutual exclusive with PCI -- so they're SDIO and GSPI */
-	/* Interrupt relatd register information. */
-	u32			SysIntrStatus;
-	u32			SysIntrMask;
-#endif
-#endif /*endif CONFIG_RTL8723B	*/
-
 #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
 	char	para_file_buf[MAX_PARA_FILE_BUF_LEN];
 	char *mac_reg;

include/hal_ic_cfg.h

@@ -42,164 +42,13 @@
 #ifdef CONFIG_MULTIDRV
 #endif
 
-#ifdef CONFIG_RTL8188E
+#undef RTL8188E_SUPPORT
-	#undef RTL8188E_SUPPORT
+#undef RATE_ADAPTIVE_SUPPORT
-	#undef RATE_ADAPTIVE_SUPPORT
+#undef POWER_TRAINING_ACTIVE
-	#undef POWER_TRAINING_ACTIVE
 
-	#define RTL8188E_SUPPORT				1
+#define RTL8188E_SUPPORT				1
-	#define RATE_ADAPTIVE_SUPPORT			1
+#define RATE_ADAPTIVE_SUPPORT			1
-	#define POWER_TRAINING_ACTIVE			1
+#define POWER_TRAINING_ACTIVE			1
-	#define CONFIG_GET_RAID_BY_DRV
+#define CONFIG_GET_RAID_BY_DRV
-#endif
-
-#ifdef CONFIG_RTL8812A
-	#undef RTL8812A_SUPPORT
-	#define RTL8812A_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8821A
-	#undef RTL8821A_SUPPORT
-	#define RTL8821A_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8192E
-	#undef RTL8192E_SUPPORT
-	#define RTL8192E_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8723B
-	#undef RTL8723B_SUPPORT
-	#define RTL8723B_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8723D
-	#undef RTL8723D_SUPPORT
-	#define RTL8723D_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-	#ifndef CONFIG_RTW_MAC_HIDDEN_RPT
-		#define CONFIG_RTW_MAC_HIDDEN_RPT
-	#endif
-	#ifndef CONFIG_RTW_CUSTOMER_STR
-		#define CONFIG_RTW_CUSTOMER_STR
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8814A
-	#undef RTL8814A_SUPPORT
-	#define RTL8814A_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8703B
-	#undef RTL8703B_SUPPORT
-	#define RTL8703B_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-	#ifndef CONFIG_RTW_MAC_HIDDEN_RPT
-		#define CONFIG_RTW_MAC_HIDDEN_RPT
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8188F
-	#undef RTL8188F_SUPPORT
-	#define RTL8188F_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-	#ifndef CONFIG_RTW_MAC_HIDDEN_RPT
-		#define CONFIG_RTW_MAC_HIDDEN_RPT
-	#endif
-	#ifndef CONFIG_RTW_CUSTOMER_STR
-		#define CONFIG_RTW_CUSTOMER_STR
-	#endif
-#endif
-
-#ifdef CONFIG_RTL8822B
-	#undef RTL8822B_SUPPORT
-	#define RTL8822B_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif /* CONFIG_FW_C2H_PKT */
-
-	#ifdef CONFIG_WOWLAN
-		#define CONFIG_GTK_OL
-		#define CONFIG_ARP_KEEP_ALIVE
-		#ifndef CONFIG_DEFAULT_PATTERNS_EN
-			#warning "Force to enable CONFIG_DEFAULT_PATTERNS_EN under WOW"
-			#define CONFIG_DEFAULT_PATTERNS_EN
-		#endif /* !CONFIG_DEFAULT_PATTERNS_EN */
-
-		#ifdef CONFIG_GPIO_WAKEUP
-			#ifndef WAKEUP_GPIO_IDX
-				#define WAKEUP_GPIO_IDX	6	/* WIFI Chip Side */
-			#endif /* !WAKEUP_GPIO_IDX */
-		#endif /* CONFIG_GPIO_WAKEUP */
-
-	#endif /* CONFIG_WOWLAN */
-	#ifdef CONFIG_CONCURRENT_MODE
-		#define CONFIG_AP_PORT_SWAP
-	#endif /* CONFIG_CONCURRENT_MODE */
-
-	/*
-	 * Beamforming related definition
-	 */
-	#if defined(CONFIG_CONCURRENT_MODE) && defined(CONFIG_BEAMFORMING)
-		#undef CONFIG_BEAMFORMING
-		#warning "Not support Beamforming in concurrent mode yet!!"
-	#endif /* CONFIG_CONCURRENT_MODE && CONFIG_BEAMFORMING */
-	/* Beamforming mechanism is on driver not phydm, always disable it */
-	#define BEAMFORMING_SUPPORT				0
-	/* Only support new beamforming mechanism */
-	#ifdef CONFIG_BEAMFORMING
-		#define RTW_BEAMFORMING_VERSION_2
-	#endif /* CONFIG_BEAMFORMING */
-
-	#ifndef CONFIG_RTW_MAC_HIDDEN_RPT
-		#define CONFIG_RTW_MAC_HIDDEN_RPT
-#endif /* CONFIG_RTW_MAC_HIDDEN_RPT */
-
-#endif /* CONFIG_RTL8822B */
-
-#ifdef CONFIG_RTL8821C
-	#undef RTL8821C_SUPPORT
-	#define RTL8821C_SUPPORT				1
-	#ifndef CONFIG_FW_C2H_PKT
-		#define CONFIG_FW_C2H_PKT
-	#endif
-	#ifdef CONFIG_NO_FW
-		#ifdef CONFIG_RTW_MAC_HIDDEN_RPT
-			#undef CONFIG_RTW_MAC_HIDDEN_RPT
-		#endif
-	#else
-		#ifndef CONFIG_RTW_MAC_HIDDEN_RPT
-			#define CONFIG_RTW_MAC_HIDDEN_RPT
-		#endif
-	#endif
-	#define LOAD_FW_HEADER_FROM_DRIVER
-	#define CONFIG_PHY_CAPABILITY_QUERY
-	#ifdef CONFIG_CONCURRENT_MODE
-	#define CONFIG_AP_PORT_SWAP
-	/*#define CONFIG_FW_MULTI_PORT_SUPPORT*/
-	#endif
-	#define CONFIG_SUPPORT_FIFO_DUMP
-#endif
 
 #endif /*__HAL_IC_CFG_H__*/

include/rtw_cmd.h

@@ -23,8 +23,6 @@
 
 #define C2H_MEM_SZ (16*1024)
 
-#ifndef CONFIG_RTL8711FW
-
 #define FREE_CMDOBJ_SZ	128
 
 #define MAX_CMDSZ	1024
@@ -205,10 +203,6 @@ u8 p2p_cancel_roch_cmd(_adapter *adapter, u64 cookie, struct wireless_dev *wdev,
 #endif /* CONFIG_IOCTL_CFG80211 */
 #endif /* CONFIG_P2P */
 
-#else
-/* #include <ieee80211.h> */
-#endif	/* CONFIG_RTL8711FW */
-
 enum rtw_drvextra_cmd_id {
 	NONE_WK_CID,
 	STA_MSTATUS_RPT_WK_CID,

include/rtw_mi.h

@@ -178,11 +178,7 @@ u8 rtw_mi_buddy_check_pending_xmitbuf(_adapter *padapter);
 #endif
 
 #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
-#ifdef CONFIG_RTL8822B
-	#include <rtl8822b_hal.h>
-#else
 	extern s32 _dequeue_writeport(PADAPTER padapter);
-#endif
 u8 rtw_mi_dequeue_writeport(_adapter *padapter);
 u8 rtw_mi_buddy_dequeue_writeport(_adapter *padapter);
 #endif

include/rtw_recv.h

@@ -217,8 +217,6 @@ struct rx_pkt_attrib	{
 
 #ifdef CONFIG_TRX_BD_ARCH
 	#define RX_WIFI_INFO_SIZE	24
-#elif (defined(CONFIG_RTL8192E) || defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B)) && defined(CONFIG_PCI_HCI)
-	#define RXBD_SIZE	sizeof(struct recv_stat)
 #endif
 
 #define RXDESC_SIZE	24
@@ -240,14 +238,9 @@ struct recv_stat {
 #else
 struct recv_stat {
 	__le32 rxdw0;
-
 	__le32 rxdw1;
-
-#if !((defined(CONFIG_RTL8192E) || defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)) && defined(CONFIG_PCI_HCI))  /* exclude 8192ee, 8814ae, 8822be, 8821ce */
 	__le32 rxdw2;
-
 	__le32 rxdw3;
-#endif
 
 #ifndef BUF_DESC_ARCH
 	__le32 rxdw4;

include/rtw_xmit.h

@@ -84,13 +84,7 @@
 	#define NR_XMIT_EXTBUFF	(32)
 #endif
 
-#ifdef CONFIG_RTL8812A
+#define MAX_CMDBUF_SZ	(5120)	/* (4096) */
-	#define MAX_CMDBUF_SZ	(512*14)
-#elif defined(CONFIG_RTL8723D) && defined(CONFIG_LPS_POFF)
-	#define MAX_CMDBUF_SZ	(128*70) /*(8960)*/
-#else
-	#define MAX_CMDBUF_SZ	(5120)	/* (4096) */
-#endif
 
 #define MAX_NUMBLKS		(1)
 
@@ -171,27 +165,10 @@
 
 /* For Buffer Descriptor ring architecture */
 #if defined(BUF_DESC_ARCH) || defined(CONFIG_TRX_BD_ARCH)
-	#if defined(CONFIG_RTL8192E)
+	#define TX_BUFFER_SEG_NUM	1 /* 0:2 seg, 1: 4 seg, 2: 8 seg. */
-		#define TX_BUFFER_SEG_NUM	1 /* 0:2 seg, 1: 4 seg, 2: 8 seg. */
-	#elif defined(CONFIG_RTL8814A)
-		#define TX_BUFFER_SEG_NUM	1 /* 0:2 seg, 1: 4 seg, 2: 8 seg. */
-	#else
-		#define TX_BUFFER_SEG_NUM	1 /* 0:2 seg, 1: 4 seg, 2: 8 seg. */
-	#endif
 #endif
 
-#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) ||\
+#define TXDESC_SIZE 32 /* old IC (ex: 8188E) */
-	defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8192E) ||\
-	defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8703B) ||\
-	defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8723D)
-	#define TXDESC_SIZE 40
-#elif defined(CONFIG_RTL8822B)
-	#define TXDESC_SIZE 48		/* HALMAC_TX_DESC_SIZE_8822B */
-#elif defined(CONFIG_RTL8821C)
-	#define TXDESC_SIZE 48		/* HALMAC_TX_DESC_SIZE_8821C */
-#else
-	#define TXDESC_SIZE 32 /* old IC (ex: 8188E) */
-#endif
 
 #ifdef CONFIG_TX_EARLY_MODE
 	#define EARLY_MODE_INFO_SIZE	8
@@ -211,20 +188,6 @@
 	#define TXDESC_OFFSET (TXDESC_SIZE + PACKET_OFFSET_SZ)
 #endif
 
-#ifdef CONFIG_PCI_HCI
-	#if defined(CONFIG_RTL8192E) || defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C) || defined(CONFIG_TRX_BD_ARCH)
-		/* this section is defined for buffer descriptor ring architecture */
-		#define TX_WIFI_INFO_SIZE (TXDESC_SIZE) /* it may add 802.11 hdr or others... */
-		/* tx desc and payload are in the same buf */
-		#define TXDESC_OFFSET (TX_WIFI_INFO_SIZE)
-	#else
-		/* tx desc and payload are NOT in the same buf */
-		#define TXDESC_OFFSET (0)
-		/* 8188ee/8723be/8812ae/8821ae has extra PCI DMA info in tx desc */
-		#define TX_DESC_NEXT_DESC_OFFSET	(TXDESC_SIZE + 8)
-	#endif
-#endif /* CONFIG_PCI_HCI */
-
 enum TXDESC_SC {
 	SC_DONT_CARE = 0x00,
 	SC_UPPER = 0x01,
@@ -232,15 +195,6 @@ enum TXDESC_SC {
 	SC_DUPLICATE = 0x03
 };
 
-#ifdef CONFIG_PCI_HCI
-	#ifndef CONFIG_TRX_BD_ARCH	/* CONFIG_TRX_BD_ARCH doesn't need this */
-		#define TXDESC_64_BYTES
-	#endif
-#elif defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8723B) \
-	|| defined(CONFIG_RTL8188F) || defined(CONFIG_RTL8723D)
-	#define TXDESC_40_BYTES
-#endif
-
 #ifdef CONFIG_TRX_BD_ARCH
 struct tx_buf_desc {
 #ifdef CONFIG_64BIT_DMA
@@ -250,18 +204,6 @@ struct tx_buf_desc {
 #endif
 	unsigned int dword[TX_BUFFER_SEG_SIZE * (2 << TX_BUFFER_SEG_NUM)];
 } __packed;
-#elif (defined(CONFIG_RTL8192E) || defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8822B)) && defined(CONFIG_PCI_HCI) /* 8192ee or 8814ae */
-/* 8192EE_TODO */
-struct tx_desc {
-	__le32 txdw0;
-	__le32 txdw1;
-	__le32 txdw2;
-	__le32 txdw3;
-	__le32 txdw4;
-	__le32 txdw5;
-	__le32 txdw6;
-	__le32 txdw7;
-};
 #else
 struct tx_desc {
 	__le32 txdw0;
@@ -825,21 +767,7 @@ struct	xmit_priv	{
 extern struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv,
 		enum cmdbuf_type buf_type);
 #define rtw_alloc_cmdxmitframe(p) __rtw_alloc_cmdxmitframe(p, CMDBUF_RSVD)
-#if defined(CONFIG_RTL8192E) && defined(CONFIG_PCI_HCI)
-extern struct xmit_frame *__rtw_alloc_cmdxmitframe_8192ee(struct xmit_priv *pxmitpriv,
-		enum cmdbuf_type buf_type);
-#define rtw_alloc_bcnxmitframe(p) __rtw_alloc_cmdxmitframe_8192ee(p, CMDBUF_BEACON)
-#elif defined(CONFIG_RTL8822B) && defined(CONFIG_PCI_HCI)
-extern struct xmit_frame *__rtw_alloc_cmdxmitframe_8822be(struct xmit_priv *pxmitpriv,
-		enum cmdbuf_type buf_type);
-#define rtw_alloc_bcnxmitframe(p) __rtw_alloc_cmdxmitframe_8822be(p, CMDBUF_BEACON)
-#elif defined(CONFIG_RTL8821C) && defined(CONFIG_PCI_HCI)
-extern struct xmit_frame *__rtw_alloc_cmdxmitframe_8821ce(struct xmit_priv *pxmitpriv,
-		enum cmdbuf_type buf_type);
-#define rtw_alloc_bcnxmitframe(p) __rtw_alloc_cmdxmitframe_8821ce(p, CMDBUF_BEACON)
-#else
 #define rtw_alloc_bcnxmitframe(p) __rtw_alloc_cmdxmitframe(p, CMDBUF_BEACON)
-#endif
 
 extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);
 extern s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);

include/usb_hal.h

@@ -28,40 +28,10 @@ void usb_c2h_hisr_hdl(_adapter *adapter, u8 *buf);
 
 u8 rtw_set_hal_ops(_adapter *padapter);
 
-#ifdef CONFIG_RTL8188E
 void rtl8188eu_set_hal_ops(_adapter *padapter);
-#endif
-
-#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
-void rtl8812au_set_hal_ops(_adapter *padapter);
-#endif
-
-#ifdef CONFIG_RTL8192E
-void rtl8192eu_set_hal_ops(_adapter *padapter);
-#endif
-
-
-#ifdef CONFIG_RTL8723B
-void rtl8723bu_set_hal_ops(_adapter *padapter);
-#endif
-
-#ifdef CONFIG_RTL8814A
-void rtl8814au_set_hal_ops(_adapter *padapter);
-#endif /* CONFIG_RTL8814A */
-
-#ifdef CONFIG_RTL8188F
-void rtl8188fu_set_hal_ops(_adapter *padapter);
-#endif
-
-#ifdef CONFIG_RTL8703B
-void rtl8703bu_set_hal_ops(_adapter *padapter);
-#endif
-
-#ifdef CONFIG_RTL8723D
-void rtl8723du_set_hal_ops(_adapter *padapter);
-#endif
 
 #ifdef CONFIG_INTEL_PROXIM
 extern _adapter  *rtw_usb_get_sw_pointer(void);
 #endif /* CONFIG_INTEL_PROXIM */
+
 #endif /* __USB_HAL_H__ */

include/usb_ops.h

@@ -37,68 +37,13 @@ enum {
 
 #include <usb_ops_linux.h>
 
-#ifdef CONFIG_RTL8188E
 void rtl8188eu_set_hw_type(struct dvobj_priv *pdvobj);
 #ifdef CONFIG_SUPPORT_USB_INT
 void interrupt_handler_8188eu(_adapter *padapter, u16 pkt_len, u8 *pbuf);
 #endif
-#endif
-
-#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
-void rtl8812au_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8812au(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif
-#endif
-
-#ifdef CONFIG_RTL8814A
-void rtl8814au_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8814au(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif
-#endif /* CONFIG_RTL8814 */
-
-#ifdef CONFIG_RTL8192E
-void rtl8192eu_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8192eu(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif
-
-#endif
-
-#ifdef CONFIG_RTL8188F
-void rtl8188fu_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8188fu(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif
-#endif
-
-#ifdef CONFIG_RTL8723B
-void rtl8723bu_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8723bu(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif
-#endif
-
-#ifdef CONFIG_RTL8703B
-void rtl8703bu_set_hw_type(struct dvobj_priv *pdvobj);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8703bu(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif /* CONFIG_SUPPORT_USB_INT */
-#endif /* CONFIG_RTL8703B */
 
 void usb_set_intf_ops(_adapter *padapter, struct _io_ops *pops);
 
-#ifdef CONFIG_RTL8723D
-void rtl8723du_set_hw_type(struct dvobj_priv *pdvobj);
-void rtl8723du_set_intf_ops(struct _io_ops *pops);
-void rtl8723du_recv_tasklet(void *priv);
-void rtl8723du_xmit_tasklet(void *priv);
-#ifdef CONFIG_SUPPORT_USB_INT
-void interrupt_handler_8723du(_adapter *padapter, u16 pkt_len, u8 *pbuf);
-#endif /* CONFIG_SUPPORT_USB_INT */
-#endif /* CONFIG_RTL8723D */
-
 enum RTW_USB_SPEED {
 	RTW_USB_SPEED_UNKNOWN	= 0,
 	RTW_USB_SPEED_1_1	= 1,