rtl8723ds: Remove CONFIG_PCI_HCI and associated dead code

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2017-10-17 00:05:02 -05:00
parent 3c1cb50012
commit 525d5256f5
13 changed files with 5 additions and 202 deletions
+1 -5
View File
@@ -27,11 +27,7 @@
#define MAX_TXPWR_IDX_NMODE_92S 63
#define Reset_Cnt_Limit 3
#ifdef CONFIG_PCI_HCI
#define MAX_AGGR_NUM 0x0B
#else
#define MAX_AGGR_NUM 0x07
#endif /* CONFIG_PCI_HCI */
#define MAX_AGGR_NUM 0x07
/*--------------------------Define Parameters End-------------------------------*/
+1 -5
View File
@@ -27,11 +27,7 @@
#define MAX_TXPWR_IDX_NMODE_92S 63
#define Reset_Cnt_Limit 3
#ifdef CONFIG_PCI_HCI
#define MAX_AGGR_NUM 0x0B
#else
#define MAX_AGGR_NUM 0x07
#endif /* CONFIG_PCI_HCI */
#define MAX_AGGR_NUM 0x07
/*--------------------------Define Parameters End-------------------------------*/
+3 -17
View File
@@ -280,7 +280,7 @@ struct hal_ops {
/*** recv section ***/
s32(*init_recv_priv)(_adapter *padapter);
void (*free_recv_priv)(_adapter *padapter);
#if defined(CONFIG_USB_HCI) || defined(CONFIG_PCI_HCI)
#if defined(CONFIG_USB_HCI)
u32(*inirp_init)(_adapter *padapter);
u32(*inirp_deinit)(_adapter *padapter);
#endif
@@ -288,18 +288,11 @@ struct hal_ops {
void (*enable_interrupt)(_adapter *padapter);
void (*disable_interrupt)(_adapter *padapter);
u8(*check_ips_status)(_adapter *padapter);
#if defined(CONFIG_PCI_HCI)
s32(*interrupt_handler)(_adapter *padapter);
#endif
#if defined(CONFIG_USB_HCI) && defined(CONFIG_SUPPORT_USB_INT)
void (*interrupt_handler)(_adapter *padapter, u16 pkt_len, u8 *pbuf);
#endif
#if defined(CONFIG_PCI_HCI)
void (*irp_reset)(_adapter *padapter);
#endif
/*** DM section ***/
void (*InitSwLeds)(_adapter *padapter);
@@ -376,7 +369,7 @@ struct hal_ops {
u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame);
s32(*fw_dl)(_adapter *adapter, u8 wowlan);
#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) || defined(CONFIG_PCI_HCI)
#if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN)
void (*clear_interrupt)(_adapter *padapter);
#endif
u8(*hal_get_tx_buff_rsvd_page_num)(_adapter *adapter, bool wowlan);
@@ -602,15 +595,11 @@ void rtw_hal_disable_interrupt(_adapter *padapter);
u8 rtw_hal_check_ips_status(_adapter *padapter);
#if defined(CONFIG_USB_HCI) || defined(CONFIG_PCI_HCI)
#if defined(CONFIG_USB_HCI)
u32 rtw_hal_inirp_init(_adapter *padapter);
u32 rtw_hal_inirp_deinit(_adapter *padapter);
#endif
#if defined(CONFIG_PCI_HCI)
void rtw_hal_irp_reset(_adapter *padapter);
#endif
u8 rtw_hal_intf_ps_func(_adapter *padapter, HAL_INTF_PS_FUNC efunc_id, u8 *val);
s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
@@ -644,9 +633,6 @@ void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMa
#define PHY_SetMacReg PHY_SetBBReg
#define PHY_QueryMacReg PHY_QueryBBReg
#if defined(CONFIG_PCI_HCI)
s32 rtw_hal_interrupt_handler(_adapter *padapter);
#endif
#if defined(CONFIG_USB_HCI) && defined(CONFIG_SUPPORT_USB_INT)
void rtw_hal_interrupt_handler(_adapter *padapter, u16 pkt_len, u8 *pbuf);
#endif
-13
View File
@@ -42,14 +42,6 @@
#endif
#endif /* !MAX_RECVBUF_SZ */
#elif defined(CONFIG_PCI_HCI)
/* #ifndef CONFIG_MINIMAL_MEMORY_USAGE */
/* #define MAX_RECVBUF_SZ (9100) */
/* #else */
#define MAX_RECVBUF_SZ (4000) /* about 4K
* #endif */
#elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
#define MAX_RECVBUF_SZ (10240)
@@ -156,11 +148,6 @@ typedef struct rxreport_8188e {
void rtl8188eu_free_recv_priv(PADAPTER padapter);
#endif
#ifdef CONFIG_PCI_HCI
s32 rtl8188ee_init_recv_priv(PADAPTER padapter);
void rtl8188ee_free_recv_priv(PADAPTER padapter);
#endif
void rtl8188e_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *prxstat);
#endif /* __RTL8188E_RECV_H__ */
-11
View File
@@ -368,17 +368,6 @@ void rtl8192e_cal_txdesc_chksum(u8 *ptxdesc);
s32 rtl8192eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);
#endif
#ifdef CONFIG_PCI_HCI
s32 rtl8192ee_init_xmit_priv(PADAPTER padapter);
void rtl8192ee_free_xmit_priv(PADAPTER padapter);
struct xmit_buf *rtl8192ee_dequeue_xmitbuf(struct rtw_tx_ring *ring);
s32 rtl8192ee_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
void rtl8192ee_xmitframe_resume(_adapter *padapter);
s32 rtl8192ee_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe);
s32 rtl8192ee_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe);
void rtl8192ee_xmit_tasklet(void *priv);
#endif
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
s32 rtl8192es_init_xmit_priv(PADAPTER padapter);
void rtl8192es_free_xmit_priv(PADAPTER padapter);
-13
View File
@@ -39,14 +39,6 @@
#endif
#endif /* !MAX_RECVBUF_SZ */
#elif defined(CONFIG_PCI_HCI)
/* #ifndef CONFIG_MINIMAL_MEMORY_USAGE */
/* #define MAX_RECVBUF_SZ (9100) */
/* #else */
#define MAX_RECVBUF_SZ (4000) /* about 4K
* #endif */
#elif defined(CONFIG_SDIO_HCI)
#if 0
/* temp solution */
@@ -169,11 +161,6 @@
void rtl8814au_free_recv_priv(PADAPTER padapter);
#endif
#ifdef CONFIG_PCI_HCI
s32 rtl8814ae_init_recv_priv(PADAPTER padapter);
void rtl8814ae_free_recv_priv(PADAPTER padapter);
#endif
#if 0
/* temp solution */
#ifdef CONFIG_SDIO_HCI
-9
View File
@@ -164,15 +164,6 @@ void rtl8821au_xmit_tasklet(void *priv);
s32 rtl8821au_xmitframe_complete(PADAPTER padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);
#endif /* CONFIG_USB_HCI */
#ifdef CONFIG_PCI_HCI
s32 rtl8821e_init_xmit_priv(PADAPTER padapter);
void rtl8821e_free_xmit_priv(PADAPTER padapter);
struct xmit_buf *rtl8821e_dequeue_xmitbuf(struct rtw_tx_ring *ring);
void rtl8821e_xmitframe_resume(PADAPTER padapter);
s32 rtl8821e_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe);
s32 rtl8821e_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe);
void rtl8821e_xmit_tasklet(void *priv);
#endif /* CONFIG_PCI_HCI */
#endif
#endif /* __RTL8821_XMIT_H__ */
-7
View File
@@ -44,13 +44,6 @@
#endif
#endif/* !MAX_RECVBUF_SZ*/
#elif defined(CONFIG_PCI_HCI)
/*#ifndef CONFIG_MINIMAL_MEMORY_USAGE
#define MAX_RECVBUF_SZ (9100)
#else*/
#define MAX_RECVBUF_SZ (4096) /* about 4K */
/*#endif*/
#elif defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
#define MAX_RECVBUF_SZ HALMAC_RX_FIFO_SIZE_8821C
-3
View File
@@ -282,9 +282,6 @@ struct reg_protocol_wt {
#endif
};
#ifdef CONFIG_PCI_HCI
#define MAX_CONTINUAL_IO_ERR 4
#endif
#ifdef CONFIG_USB_HCI
#define MAX_CONTINUAL_IO_ERR 4