[PATCH 11/30] staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA

[Larry Finger <Larry.Finger@xxxxxxxxxxxx>]

Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
 drivers/staging/rtl8192e/dot11d.c         |   17 +----------------
 drivers/staging/rtl8192e/rtl_core.c       |    2 --
 drivers/staging/rtl8192e/rtllib_softmac.c |    7 -------
 drivers/staging/rtl8192e/rtllib_wx.c      |    2 --
 4 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c
index 4253044..0a1522b 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -43,12 +43,7 @@ static CHANNEL_LIST ChannelPlan[] = {
 void Dot11d_Init(struct rtllib_device *ieee)
 {
 	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
-#ifdef CONFIG_CRDA
-	ieee->bGlobalDomain = true;
-	pDot11dInfo->bEnabled = true;
-#else
 	pDot11dInfo->bEnabled = false;
-#endif
 
 	pDot11dInfo->State = DOT11D_STATE_NONE;
 	pDot11dInfo->CountryIeLen = 0;
@@ -103,9 +98,8 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device* ieee)
 void Dot11d_Reset(struct rtllib_device *ieee)
 {
 	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
-
-#ifndef CONFIG_CRDA
 	u32 i;
+
 	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER+1);
 	memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER+1);
 	for (i=1; i<=11; i++) {
@@ -114,7 +108,6 @@ void Dot11d_Reset(struct rtllib_device *ieee)
 	for (i=12; i<=14; i++) {
 		(pDot11dInfo->channel_map)[i] = 2;
 	}
-#endif
 	pDot11dInfo->State = DOT11D_STATE_NONE;
 	pDot11dInfo->CountryIeLen = 0;
 	RESET_CIE_WATCHDOG(ieee);
@@ -125,9 +118,6 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
 	                    u16 CoutryIeLen, u8* pCoutryIe)
 {
 	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
-#ifdef CONFIG_CRDA
-
-#else
 	u8 i, j, NumTriples, MaxChnlNum;
 	PCHNL_TXPOWER_TRIPLE pTriple;
 
@@ -158,17 +148,12 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
 
 		pTriple = (PCHNL_TXPOWER_TRIPLE)((u8*)pTriple + 3);
 	}
-#endif
 
 	UPDATE_CIE_SRC(dev, pTaddr);
 
 	pDot11dInfo->CountryIeLen = CoutryIeLen;
 	memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe,CoutryIeLen);
 	pDot11dInfo->State = DOT11D_STATE_LEARNED;
-
-#ifdef CONFIG_CRDA
-	queue_delayed_work_rsl(dev->wq, &dev->softmac_hint11d_wq, 0);
-#endif
 }
 
 u8 DOT11D_GetMaxTxPwrInDbm( struct rtllib_device *dev, u8 Channel)
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index 72ec737..7fb33c9 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -1360,9 +1360,7 @@ short rtl8192_get_channel_map(struct net_device * dev)
 	}
 	RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan);
 	Dot11d_Init(priv->rtllib);
-#ifndef CONFIG_CRDA
 	Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
-#endif
 	for (i = 1; i <= 11; i++) {
 		(priv->rtllib->active_channel_map)[i] = 1;
 	}
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 06c8a7c..bc8d3f4 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -525,13 +525,6 @@ void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh)
 
 void rtllib_softmac_hint11d_wq(void *data)
 {
-#ifdef CONFIG_CRDA
-	struct rtllib_device *ieee = container_of_dwork_rsl(data, struct rtllib_device, softmac_hint11d_wq);
-	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
-	struct wireless_dev *wdev = &ieee->wdev;
-
-	regulatory_hint_11d(wdev->wiphy, pDot11dInfo->CountryIeBuf, pDot11dInfo->CountryIeLen);
-#endif
 }
 
 void rtllib_update_active_chan_map(struct rtllib_device *ieee)
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 0855ad8..db4c568 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -215,7 +215,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
 		start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
         }
 
-#ifndef CUSTOMER_ID_INTEL_CMPC
 	/* add info for WZC */
 	memset(&iwe, 0, sizeof(iwe));
 	if (network->wzc_ie_len)
@@ -226,7 +225,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
 		iwe.u.data.length = network->wzc_ie_len;
 		start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf);
         }
-#endif
 
 	/* Add EXTRA: Age to display seconds since last beacon/probe response
 	 * for given network. */
-- 
1.7.3.4

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel