Commit e96031d0 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman

staging: r8188eu: Remove even more empty routines

This patch removes the following:

odm_DynamicTxPowerAP
odm_RSSIMonitorCheckMP
odm_RSSIMonitorCheckAP
odm_TXPowerTrackingCheckMP
odm_TXPowerTrackingCheckAP
odm_SwAntDivInit
ODM_SwAntDivChkPerPktRssi
odm_SwAntDivChkAntSwitch
ODM_SwAntDivRestAfterLink
dm_GlobalAdapterCheck
odm_dtc
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36298867
...@@ -195,8 +195,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm) ...@@ -195,8 +195,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) || (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) ||
(pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)) (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
odm_InitHybridAntDiv(pDM_Odm); odm_InitHybridAntDiv(pDM_Odm);
else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)
odm_SwAntDivInit(pDM_Odm);
} }
} }
...@@ -206,7 +204,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm) ...@@ -206,7 +204,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm) void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
{ {
/* 2012.05.03 Luke: For all IC series */ /* 2012.05.03 Luke: For all IC series */
odm_GlobalAdapterCheck();
odm_CmnInfoHook_Debug(pDM_Odm); odm_CmnInfoHook_Debug(pDM_Odm);
odm_CmnInfoUpdate_Debug(pDM_Odm); odm_CmnInfoUpdate_Debug(pDM_Odm);
odm_CommonInfoSelfUpdate(pDM_Odm); odm_CommonInfoSelfUpdate(pDM_Odm);
...@@ -240,8 +237,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm) ...@@ -240,8 +237,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
(pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) || (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV) ||
(pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV)) (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))
odm_HwAntDiv(pDM_Odm); odm_HwAntDiv(pDM_Odm);
else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)
odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_PEAK);
if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) { if (pDM_Odm->SupportICType & ODM_IC_11AC_SERIES) {
; ;
...@@ -250,7 +245,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm) ...@@ -250,7 +245,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
odm_EdcaTurboCheck(pDM_Odm); odm_EdcaTurboCheck(pDM_Odm);
odm_DynamicTxPower(pDM_Odm); odm_DynamicTxPower(pDM_Odm);
} }
odm_dtc(pDM_Odm);
} }
/* Init /.. Fixed HW value. Only init time. */ /* Init /.. Fixed HW value. Only init time. */
...@@ -1453,7 +1447,6 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm) ...@@ -1453,7 +1447,6 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
odm_DynamicTxPowerNIC(pDM_Odm); odm_DynamicTxPowerNIC(pDM_Odm);
break; break;
case ODM_AP: case ODM_AP:
odm_DynamicTxPowerAP(pDM_Odm);
break; break;
case ODM_ADSL: case ODM_ADSL:
break; break;
...@@ -1471,10 +1464,6 @@ void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm) ...@@ -1471,10 +1464,6 @@ void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm)
} }
} }
void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm)
{
}
/* 3============================================================ */ /* 3============================================================ */
/* 3 RSSI Monitor */ /* 3 RSSI Monitor */
/* 3============================================================ */ /* 3============================================================ */
...@@ -1491,13 +1480,11 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) ...@@ -1491,13 +1480,11 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm)
/* */ /* */
switch (pDM_Odm->SupportPlatform) { switch (pDM_Odm->SupportPlatform) {
case ODM_MP: case ODM_MP:
odm_RSSIMonitorCheckMP(pDM_Odm);
break; break;
case ODM_CE: case ODM_CE:
odm_RSSIMonitorCheckCE(pDM_Odm); odm_RSSIMonitorCheckCE(pDM_Odm);
break; break;
case ODM_AP: case ODM_AP:
odm_RSSIMonitorCheckAP(pDM_Odm);
break; break;
case ODM_ADSL: case ODM_ADSL:
/* odm_DIGAP(pDM_Odm); */ /* odm_DIGAP(pDM_Odm); */
...@@ -1506,10 +1493,6 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) ...@@ -1506,10 +1493,6 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm)
} /* odm_RSSIMonitorCheck */ } /* odm_RSSIMonitorCheck */
void odm_RSSIMonitorCheckMP(struct odm_dm_struct *pDM_Odm)
{
}
static void FindMinimumRSSI(struct adapter *pAdapter) static void FindMinimumRSSI(struct adapter *pAdapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
...@@ -1582,10 +1565,6 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm) ...@@ -1582,10 +1565,6 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm)
ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM);
} }
void odm_RSSIMonitorCheckAP(struct odm_dm_struct *pDM_Odm)
{
}
void ODM_InitAllTimers(struct odm_dm_struct *pDM_Odm) void ODM_InitAllTimers(struct odm_dm_struct *pDM_Odm)
{ {
ODM_InitializeTimer(pDM_Odm, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer, ODM_InitializeTimer(pDM_Odm, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchTimer,
...@@ -1625,13 +1604,11 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm) ...@@ -1625,13 +1604,11 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm)
/* HW dynamic mechanism. */ /* HW dynamic mechanism. */
switch (pDM_Odm->SupportPlatform) { switch (pDM_Odm->SupportPlatform) {
case ODM_MP: case ODM_MP:
odm_TXPowerTrackingCheckMP(pDM_Odm);
break; break;
case ODM_CE: case ODM_CE:
odm_TXPowerTrackingCheckCE(pDM_Odm); odm_TXPowerTrackingCheckCE(pDM_Odm);
break; break;
case ODM_AP: case ODM_AP:
odm_TXPowerTrackingCheckAP(pDM_Odm);
break; break;
case ODM_ADSL: case ODM_ADSL:
break; break;
...@@ -1656,14 +1633,6 @@ void odm_TXPowerTrackingCheckCE(struct odm_dm_struct *pDM_Odm) ...@@ -1656,14 +1633,6 @@ void odm_TXPowerTrackingCheckCE(struct odm_dm_struct *pDM_Odm)
} }
} }
void odm_TXPowerTrackingCheckMP(struct odm_dm_struct *pDM_Odm)
{
}
void odm_TXPowerTrackingCheckAP(struct odm_dm_struct *pDM_Odm)
{
}
/* antenna mapping info */ /* antenna mapping info */
/* 1: right-side antenna */ /* 1: right-side antenna */
/* 2/0: left-side antenna */ /* 2/0: left-side antenna */
...@@ -1675,21 +1644,6 @@ void odm_TXPowerTrackingCheckAP(struct odm_dm_struct *pDM_Odm) ...@@ -1675,21 +1644,6 @@ void odm_TXPowerTrackingCheckAP(struct odm_dm_struct *pDM_Odm)
/* 3============================================================ */ /* 3============================================================ */
/* 3 SW Antenna Diversity */ /* 3 SW Antenna Diversity */
/* 3============================================================ */ /* 3============================================================ */
void odm_SwAntDivInit(struct odm_dm_struct *pDM_Odm)
{
}
void ODM_SwAntDivChkPerPktRssi(struct odm_dm_struct *pDM_Odm, u8 StationID, struct odm_phy_status_info *pPhyInfo)
{
}
void odm_SwAntDivChkAntSwitch(struct odm_dm_struct *pDM_Odm, u8 Step)
{
}
void ODM_SwAntDivRestAfterLink(struct odm_dm_struct *pDM_Odm)
{
}
void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext)
{ {
...@@ -1904,11 +1858,6 @@ u32 ConvertTo_dB(u32 Value) ...@@ -1904,11 +1858,6 @@ u32 ConvertTo_dB(u32 Value)
return dB; return dB;
} }
/* 2011/09/22 MH Add for 92D global spin lock utilization. */
void odm_GlobalAdapterCheck(void)
{
} /* odm_GlobalAdapterCheck */
/* Description: */ /* Description: */
/* Set Single/Dual Antenna default setting for products that do not do detection in advance. */ /* Set Single/Dual Antenna default setting for products that do not do detection in advance. */
/* Added by Joseph, 2012.03.22 */ /* Added by Joseph, 2012.03.22 */
...@@ -2168,8 +2117,3 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode) ...@@ -2168,8 +2117,3 @@ bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode)
} }
return bResult; return bResult;
} }
/* Justin: According to the current RRSI to adjust Response Frame TX power, 2012/11/05 */
void odm_dtc(struct odm_dm_struct *pDM_Odm)
{
}
...@@ -531,9 +531,7 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm, ...@@ -531,9 +531,7 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm,
odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus, odm_RxPhyStatus92CSeries_Parsing(dm_odm, pPhyInfo, pPhyStatus,
pPktinfo); pPktinfo);
if (dm_odm->RSSI_test) { if (dm_odm->RSSI_test) {
/* Select the packets to do RSSI checking for antenna switching. */ ;/* Select the packets to do RSSI checking for antenna switching. */
if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)
ODM_SwAntDivChkPerPktRssi(dm_odm, pPktinfo->StationID, pPhyInfo);
} else { } else {
odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo); odm_Process_RSSIForDM(dm_odm, pPhyInfo, pPktinfo);
} }
......
...@@ -1146,10 +1146,6 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm); ...@@ -1146,10 +1146,6 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm);
bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI,
bool bForceUpdate, u8 *pRATRState); bool bForceUpdate, u8 *pRATRState);
#define dm_SWAW_RSSI_Check ODM_SwAntDivChkPerPktRssi
void ODM_SwAntDivChkPerPktRssi(struct odm_dm_struct *pDM_Odm, u8 StationID,
struct odm_phy_status_info *pPhyInfo);
u32 ConvertTo_dB(u32 Value); u32 ConvertTo_dB(u32 Value);
u32 GetPSDData(struct odm_dm_struct *pDM_Odm, unsigned int point, u32 GetPSDData(struct odm_dm_struct *pDM_Odm, unsigned int point,
......
...@@ -64,7 +64,6 @@ void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm); ...@@ -64,7 +64,6 @@ void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm);
void odm_TXPowerTrackingInit(struct odm_dm_struct *pDM_Odm); void odm_TXPowerTrackingInit(struct odm_dm_struct *pDM_Odm);
void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm); void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm);
void odm_SwAntDivInit_NIC(struct odm_dm_struct *pDM_Odm); void odm_SwAntDivInit_NIC(struct odm_dm_struct *pDM_Odm);
void odm_GlobalAdapterCheck(void);
void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm); void odm_CmnInfoUpdate_Debug(struct odm_dm_struct *pDM_Odm);
void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm); void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm);
void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm); void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm);
...@@ -76,22 +75,16 @@ void odm_SwAntDivChkAntSwitch(struct odm_dm_struct *pDM_Odm, u8 Step); ...@@ -76,22 +75,16 @@ void odm_SwAntDivChkAntSwitch(struct odm_dm_struct *pDM_Odm, u8 Step);
void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm); void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm);
void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm); void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm);
void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm); void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm);
void odm_SwAntDivInit(struct odm_dm_struct *pDM_Odm);
void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm); void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm);
void odm_RefreshRateAdaptiveMask(struct odm_dm_struct *pDM_Odm); void odm_RefreshRateAdaptiveMask(struct odm_dm_struct *pDM_Odm);
void odm_1R_CCA(struct odm_dm_struct *pDM_Odm); void odm_1R_CCA(struct odm_dm_struct *pDM_Odm);
void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm); void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm);
void odm_RefreshRateAdaptiveMaskAPADSL(struct odm_dm_struct *pDM_Odm); void odm_RefreshRateAdaptiveMaskAPADSL(struct odm_dm_struct *pDM_Odm);
void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm); void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm);
void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm);
void odm_RSSIMonitorCheckMP(struct odm_dm_struct *pDM_Odm);
void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm); void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm);
void odm_RSSIMonitorCheckAP(struct odm_dm_struct *pDM_Odm);
void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_Odm); void odm_TXPowerTrackingThermalMeterInit(struct odm_dm_struct *pDM_Odm);
void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm); void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm);
void odm_TXPowerTrackingCheckCE(struct odm_dm_struct *pDM_Odm); void odm_TXPowerTrackingCheckCE(struct odm_dm_struct *pDM_Odm);
void odm_TXPowerTrackingCheckMP(struct odm_dm_struct *pDM_Odm);
void odm_TXPowerTrackingCheckAP(struct odm_dm_struct *pDM_Odm);
void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext); void odm_SwAntDivChkAntSwitchCallback(void *FunctionContext);
void odm_InitHybridAntDiv(struct odm_dm_struct *pDM_Odm); void odm_InitHybridAntDiv(struct odm_dm_struct *pDM_Odm);
void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm); void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment