rtl8188eu: Remove dead code from CONFIG_MP_INCLUDED

This parameter is used to turn on manufacturing test code.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-15 13:42:27 -06:00
parent a0c85b341e
commit 4ee8d3010d
9 changed files with 0 additions and 1994 deletions

View file

@ -32,7 +32,6 @@ CONFIG_PCI_HCI = n
CONFIG_SDIO_HCI = n CONFIG_SDIO_HCI = n
CONFIG_GSPI_HCI = n CONFIG_GSPI_HCI = n
CONFIG_MP_INCLUDED = y
CONFIG_POWER_SAVING = y CONFIG_POWER_SAVING = y
CONFIG_USB_AUTOSUSPEND = n CONFIG_USB_AUTOSUSPEND = n
CONFIG_HW_PWRP_DETECTION = n CONFIG_HW_PWRP_DETECTION = n
@ -298,10 +297,6 @@ _HAL_INTFS_FILES += hal/$(RTL871X)/$(HCI_NAME)/$(HCI_NAME)_ops_linux.o
endif endif
endif endif
ifeq ($(CONFIG_MP_INCLUDED), y)
_HAL_INTFS_FILES += hal/$(RTL871X)/$(RTL871X)_mp.o
endif
_HAL_INTFS_FILES += $(CHIP_FILES) _HAL_INTFS_FILES += $(CHIP_FILES)
@ -321,11 +316,6 @@ EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND
endif endif
endif endif
ifeq ($(CONFIG_MP_INCLUDED), y)
#MODULE_NAME := $(MODULE_NAME)_mp
EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED
endif
ifeq ($(CONFIG_POWER_SAVING), y) ifeq ($(CONFIG_POWER_SAVING), y)
EXTRA_CFLAGS += -DCONFIG_POWER_SAVING EXTRA_CFLAGS += -DCONFIG_POWER_SAVING
endif endif
@ -797,13 +787,6 @@ $(MODULE_NAME)-y += $(_HAL_INTFS_FILES)
$(MODULE_NAME)-y += $(_OS_INTFS_FILES) $(MODULE_NAME)-y += $(_OS_INTFS_FILES)
$(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o \
core/rtw_mp_ioctl.o
ifeq ($(CONFIG_RTL8723A), y)
$(MODULE_NAME)-$(CONFIG_MP_INCLUDED)+= core/rtw_bt_mp.o
endif
obj-$(CONFIG_RTL8188EU) := $(MODULE_NAME).o obj-$(CONFIG_RTL8188EU) := $(MODULE_NAME).o
else else

View file

@ -85,7 +85,6 @@
//#define CONFIG_USB_INTERRUPT_IN_PIPE //#define CONFIG_USB_INTERRUPT_IN_PIPE
#endif #endif
//#ifndef CONFIG_MP_INCLUDED
#define CONFIG_IPS #define CONFIG_IPS
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
//#define CONFIG_IPS_LEVEL_2 //enable this to set default IPS mode to IPS_LEVEL_2 //#define CONFIG_IPS_LEVEL_2 //enable this to set default IPS mode to IPS_LEVEL_2
@ -120,9 +119,6 @@
#endif #endif
#define CONFIG_IOL #define CONFIG_IOL
//#else //#ifndef CONFIG_MP_INCLUDED
//#endif //#ifndef CONFIG_MP_INCLUDED
#define CONFIG_AP_MODE #define CONFIG_AP_MODE
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
@ -269,14 +265,7 @@
//#define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0 //#define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0
#ifdef CONFIG_MP_INCLUDED
#define MP_DRIVER 1
#define CONFIG_MP_IWPRIV_SUPPORT
//#undef CONFIG_USB_TX_AGGREGATION
//#undef CONFIG_USB_RX_AGGREGATION
#else
#define MP_DRIVER 0 #define MP_DRIVER 0
#endif
/* /*

View file

@ -91,10 +91,6 @@ typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
#include <drvext_api.h> #include <drvext_api.h>
#endif #endif
#ifdef CONFIG_MP_INCLUDED
#include <rtw_mp.h>
#endif
#ifdef CONFIG_BR_EXT #ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h> #include <rtw_br_ext.h>
#endif // CONFIG_BR_EXT #endif // CONFIG_BR_EXT
@ -503,9 +499,6 @@ struct _ADAPTER{
struct workqueue_struct *priv_checkbt_wq; struct workqueue_struct *priv_checkbt_wq;
struct delayed_work checkbt_work; struct delayed_work checkbt_work;
#endif #endif
#ifdef CONFIG_MP_INCLUDED
struct mp_priv mppriv;
#endif
#ifdef CONFIG_DRVEXT_MODULE #ifdef CONFIG_DRVEXT_MODULE
struct drvext_priv drvextpriv; struct drvext_priv drvextpriv;

View file

@ -103,16 +103,6 @@ struct oid_obj_priv {
NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv); NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv);
}; };
#if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_)) || \
(defined(PLATFORM_WINDOWS) && defined(_RTW_IOCTL_RTL_C_))
static NDIS_STATUS oid_null_function(struct oid_par_priv* poid_par_priv)
{
_func_enter_;
_func_exit_;
return NDIS_STATUS_SUCCESS;
}
#endif
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE ndisPsMode); int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE ndisPsMode);

View file

@ -2211,17 +2211,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
} }
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
{
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)
{
ret = -EPERM;
goto exit;
}
}
#endif
_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL); _enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
pwdev_priv->scan_request = request; pwdev_priv->scan_request = request;
_exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL);

File diff suppressed because it is too large Load diff

View file

@ -1543,14 +1543,6 @@ _func_enter_;
rtw_init_pwrctrl_priv(padapter); rtw_init_pwrctrl_priv(padapter);
//_rtw_memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv));//move to mlme_priv
#ifdef CONFIG_MP_INCLUDED
if (init_mp_priv(padapter) == _FAIL) {
DBG_871X("%s: initialize MP private data Fail!\n", __func__);
}
#endif
ret8 = rtw_init_default_value(padapter); ret8 = rtw_init_default_value(padapter);
rtw_hal_dm_init(padapter); rtw_hal_dm_init(padapter);

View file

@ -820,10 +820,6 @@ _func_enter_;
DBG_871X(KERN_NOTICE "%s: device had been removed!\n", __func__); DBG_871X(KERN_NOTICE "%s: device had been removed!\n", __func__);
} }
} }
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
MPT_DeInitAdapter(padapter);
#endif
#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj)); rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj));
#endif #endif

View file

@ -2001,10 +2001,6 @@ _func_enter_;
//DBG_871X("r871xu_dev_remove():module removed\n"); //DBG_871X("r871xu_dev_remove():module removed\n");
padapter->hw_init_completed = _FALSE; padapter->hw_init_completed = _FALSE;
}*/ }*/
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
MPT_DeInitAdapter(padapter);
#endif
#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj)); rtw_unregister_early_suspend(dvobj_to_pwrctl(dvobj));
#endif #endif