lkml.org 
[lkml]   [2015]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv3 15/15] staging: rtl8192u: remove all code framed by symbol TO_DO_LIST
    Date
    The symbol TO_DO_LIST was used in the code to frame sections
    of code unused or unusable. This patch remove all code framed
    by that symbol in this driver.

    Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
    ---
    drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
    drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 23 -----
    .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 -
    .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 5 +-
    drivers/staging/rtl8192u/r8192U_core.c | 102 ++-------------------
    drivers/staging/rtl8192u/r819xU_phy.c | 57 ------------
    6 files changed, 9 insertions(+), 186 deletions(-)

    diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    index d481a26..28ba7d2 100644
    --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
    @@ -1654,10 +1654,10 @@ struct ieee80211_device {
    struct list_head Rx_TS_Pending_List;
    struct list_head Rx_TS_Unused_List;
    RX_TS_RECORD RxTsRecord[TOTAL_TS_NUM];
    -//#ifdef TO_DO_LIST
    +
    RX_REORDER_ENTRY RxReorderEntry[128];
    struct list_head RxReorder_Unused_List;
    -//#endif
    +
    // Qos related. Added by Annie, 2005-11-01.
    // PSTA_QOS pStaQos;
    u8 ForcedPriority; // Force per-packet priority 1~7. (default: 0, not to force it.)
    diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
    index 1ab0aea..36a7acc 100644
    --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
    +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
    @@ -318,13 +318,6 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
    if (is_multicast_ether_addr(hdr->addr1))
    return;
    //check packet and mode later
    -#ifdef TO_DO_LIST
    - if(pTcb->PacketLength >= 4096)
    - return;
    - // For RTL819X, if pairwisekey = wep/tkip, we don't aggrregation.
    - if(!Adapter->HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))
    - return;
    -#endif
    if(!ieee->GetNmodeSupportBySecCfg(ieee->dev))
    {
    return;
    @@ -550,22 +543,6 @@ NO_PROTECTION:
    static void ieee80211_txrate_selectmode(struct ieee80211_device *ieee,
    cb_desc *tcb_desc)
    {
    -#ifdef TO_DO_LIST
    - if(!IsDataFrame(pFrame))
    - {
    - pTcb->bTxDisableRateFallBack = true;
    - pTcb->bTxUseDriverAssingedRate = true;
    - pTcb->RATRIndex = 7;
    - return;
    - }
    -
    - if(pMgntInfo->ForcedDataRate!= 0)
    - {
    - pTcb->bTxDisableRateFallBack = true;
    - pTcb->bTxUseDriverAssingedRate = true;
    - return;
    - }
    -#endif
    if(ieee->bTxDisableRateFallBack)
    tcb_desc->bTxDisableRateFallBack = true;

    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    index c27397b..87b1bb9 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
    @@ -88,10 +88,6 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee)
    ieee->bTxDisableRateFallBack = 0;
    ieee->bTxUseDriverAssingedRate = 0;

    -#ifdef TO_DO_LIST
    - // 8190 only. Assign duration operation mode to firmware
    - pMgntInfo->bTxEnableFwCalcDur = (BOOLEAN)pNdisCommon->bRegTxEnableFwCalcDur;
    -#endif
    // 8190 only, Realtek proprietary aggregation mode
    // Set MPDUDensity=2, 1: Set MPDUDensity=2(32k) for Realtek AP and set MPDUDensity=0(8k) for others
    pHTInfo->bRegRT2RTAggregation = 1;//0: Set MPDUDensity=2, 1: Set MPDUDensity=2(32k) for Realtek AP and set MPDUDensity=0(8k) for others
    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
    index f33c743..fb493a2 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
    @@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee)
    }
    // Initialize unused Rx Reorder List.
    INIT_LIST_HEAD(&ieee->RxReorder_Unused_List);
    -//#ifdef TO_DO_LIST
    +
    for(count = 0; count < REORDER_ENTRY_NUM; count++)
    {
    list_add_tail( &pRxReorderEntry->List,&ieee->RxReorder_Unused_List);
    @@ -201,7 +201,6 @@ void TSInitialize(struct ieee80211_device *ieee)
    break;
    pRxReorderEntry = &ieee->RxReorderEntry[count+1];
    }
    -//#endif

    }

    @@ -461,7 +460,6 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,

    if(TxRxSelect == RX_DIR)
    {
    -//#ifdef TO_DO_LIST
    PRX_REORDER_ENTRY pRxReorderEntry;
    PRX_TS_RECORD pRxTS = (PRX_TS_RECORD)pTs;
    if(timer_pending(&pRxTS->RxPktPendingTimer))
    @@ -493,7 +491,6 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
    spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
    }

    -//#endif
    }
    else
    {
    diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
    index 7e04259..0ab371b 100644
    --- a/drivers/staging/rtl8192u/r8192U_core.c
    +++ b/drivers/staging/rtl8192u/r8192U_core.c
    @@ -2167,14 +2167,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
    wireless_mode = WIRELESS_MODE_B;
    }
    }
    -#ifdef TO_DO_LIST
    - /* TODO: this function doesn't work well at this time,
    - * we should wait for FPGA
    - */
    - ActUpdateChannelAccessSetting(
    - pAdapter, pHalData->CurrentWirelessMode,
    - &pAdapter->MgntInfo.Info8185.ChannelAccessSetting);
    -#endif
    +
    priv->ieee80211->mode = wireless_mode;

    if (wireless_mode == WIRELESS_MODE_N_24G ||
    @@ -2250,12 +2243,7 @@ static void rtl8192_init_priv_variable(struct net_device *dev)

    priv->ieee80211->InitialGainHandler = InitialGain819xUsb;
    priv->card_type = USB;
    -#ifdef TO_DO_LIST
    - if (Adapter->bInHctTest) {
    - pHalData->ShortRetryLimit = 7;
    - pHalData->LongRetryLimit = 7;
    - }
    -#endif
    +
    priv->ShortRetryLimit = 0x30;
    priv->LongRetryLimit = 0x30;
    priv->EarlyRxThreshold = 7;
    @@ -2271,34 +2259,7 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
    * TRUE: SW provides them
    */
    (false ? TCR_SAT : 0);
    -#ifdef TO_DO_LIST
    - if (Adapter->bInHctTest)
    - pHalData->ReceiveConfig =
    - pHalData->CSMethod |
    - /* accept management/data */
    - RCR_AMF | RCR_ADF |
    - /* accept control frame for SW
    - * AP needs PS-poll
    - */
    - RCR_ACF |
    - /* accept BC/MC/UC */
    - RCR_AB | RCR_AM | RCR_APM |
    - /* accept ICV/CRC error
    - * packet
    - */
    - RCR_AICV | RCR_ACRC32 |
    - /* Max DMA Burst Size per Tx
    - * DMA Burst, 7: unlimited.
    - */
    - ((u32)7 << RCR_MXDMA_OFFSET) |
    - /* Rx FIFO Threshold,
    - * 7: No Rx threshold.
    - */
    - (pHalData->EarlyRxThreshold << RCR_FIFO_OFFSET) |
    - (pHalData->EarlyRxThreshold == 7 ? RCR_OnlyErlPkt : 0);
    - else

    -#endif
    priv->ReceiveConfig =
    /* accept management/data */
    RCR_AMF | RCR_ADF |
    @@ -2758,19 +2719,10 @@ static void rtl8192_hwconfig(struct net_device *dev)
    regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
    break;
    case WIRELESS_MODE_AUTO:
    -#ifdef TO_DO_LIST
    - if (Adapter->bInHctTest) {
    - regBwOpMode = BW_OPMODE_20MHZ;
    - regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
    - regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
    - } else
    -#endif
    - {
    - regBwOpMode = BW_OPMODE_20MHZ;
    - regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
    - RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
    - regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
    - }
    + regBwOpMode = BW_OPMODE_20MHZ;
    + regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
    + RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
    + regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
    break;
    case WIRELESS_MODE_N_24G:
    /* It support CCK rate by default. CCK rate will be filtered
    @@ -2944,48 +2896,6 @@ static bool rtl8192_adapter_start(struct net_device *dev)
    }
    RT_TRACE(COMP_INIT, "%s():after firmware download\n", __func__);

    -#ifdef TO_DO_LIST
    - if (Adapter->ResetProgress == RESET_TYPE_NORESET) {
    - if (pMgntInfo->RegRfOff) { /* User disable RF via registry. */
    - RT_TRACE((COMP_INIT | COMP_RF), DBG_LOUD,
    - ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n"));
    - MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW);
    - /* Those actions will be discard in MgntActSet_RF_State
    - * because of the same state
    - */
    - for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
    - PHY_SetRFReg(Adapter,
    - (RF90_RADIO_PATH_E)eRFPath,
    - 0x4, 0xC00, 0x0);
    - } else if (pMgntInfo->RfOffReason > RF_CHANGE_BY_PS) {
    - /* H/W or S/W RF OFF before sleep. */
    - RT_TRACE((COMP_INIT | COMP_RF), DBG_LOUD,
    - ("InitializeAdapter819xUsb(): Turn off RF for RfOffReason(%d) ----------\n",
    - pMgntInfo->RfOffReason));
    - MgntActSet_RF_State(Adapter,
    - eRfOff,
    - pMgntInfo->RfOffReason);
    - } else {
    - pHalData->eRFPowerState = eRfOn;
    - pMgntInfo->RfOffReason = 0;
    - RT_TRACE((COMP_INIT | COMP_RF), DBG_LOUD,
    - ("InitializeAdapter819xUsb(): RF is on ----------\n"));
    - }
    - } else {
    - if (pHalData->eRFPowerState == eRfOff) {
    - MgntActSet_RF_State(Adapter,
    - eRfOff,
    - pMgntInfo->RfOffReason);
    - /* Those actions will be discard in MgntActSet_RF_State
    - * because of the same state
    - */
    - for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
    - PHY_SetRFReg(Adapter,
    - (RF90_RADIO_PATH_E)eRFPath,
    - 0x4, 0xC00, 0x0);
    - }
    - }
    -#endif
    /* config RF. */
    if (priv->ResetProgress == RESET_TYPE_NORESET) {
    rtl8192_phy_RFConfig(dev);
    diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
    index e5dbaca..55c3577 100644
    --- a/drivers/staging/rtl8192u/r819xU_phy.c
    +++ b/drivers/staging/rtl8192u/r819xU_phy.c
    @@ -523,16 +523,6 @@ void rtl8192_phyConfigBB(struct net_device *dev, u8 ConfigType)
    {
    u32 i;

    -#ifdef TO_DO_LIST
    - u32 *rtl8192PhyRegArrayTable = NULL, *rtl8192AgcTabArrayTable = NULL;
    -
    - if (Adapter->bInHctTest) {
    - PHY_REGArrayLen = PHY_REGArrayLengthDTM;
    - AGCTAB_ArrayLen = AGCTAB_ArrayLengthDTM;
    - Rtl8190PHY_REGArray_Table = Rtl819XPHY_REGArrayDTM;
    - Rtl8190AGCTAB_Array_Table = Rtl819XAGCTAB_ArrayDTM;
    - }
    -#endif
    if (ConfigType == BaseBand_Config_PHY_REG) {
    for (i = 0; i < PHY_REG_1T2RArrayLength; i += 2) {
    rtl8192_setBBreg(dev, rtl819XPHY_REG_1T2RArray[i],
    @@ -1063,10 +1053,6 @@ static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)

    switch (priv->rf_chip) {
    case RF_8225:
    -#ifdef TO_DO_LIST
    - PHY_SetRF8225CckTxPower(Adapter, powerlevel);
    - PHY_SetRF8225OfdmTxPower(Adapter, powerlevelOFDM24G);
    -#endif
    break;

    case RF_8256:
    @@ -1164,47 +1150,7 @@ bool rtl8192_SetRFPowerState(struct net_device *dev,
    RT_TRACE(COMP_ERR, "Not support rf_chip(%x)\n", priv->rf_chip);
    break;
    }
    -#ifdef TO_DO_LIST
    - if (bResult) {
    - /* Update current RF state variable. */
    - pHalData->eRFPowerState = eRFPowerState;
    - switch (pHalData->RFChipID) {
    - case RF_8256:
    - switch (pHalData->eRFPowerState) {
    - case eRfOff:
    - /* If Rf off reason is from IPS,
    - LED should blink with no link */
    - if (pMgntInfo->RfOffReason == RF_CHANGE_BY_IPS)
    - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_NO_LINK);
    - else
    - /* Turn off LED if RF is not ON. */
    - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_POWER_OFF);
    - break;
    -
    - case eRfOn:
    - /* Turn on RF we are still linked, which might
    - happen when we quickly turn off and on HW RF.
    - */
    - if (pMgntInfo->bMediaConnect)
    - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_LINK);
    - else
    - /* Turn off LED if RF is not ON. */
    - Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_NO_LINK);
    - break;
    -
    - default:
    - break;
    - }
    - break;
    -
    - default:
    - RT_TRACE(COMP_RF, DBG_LOUD, "%s(): Unknown RF type\n",
    - __func__);
    - break;
    - }

    - }
    -#endif
    priv->SetRFPowerStateInProgress = false;

    return bResult;
    @@ -1629,9 +1575,6 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
    /* <3> Set RF related register */
    switch (priv->rf_chip) {
    case RF_8225:
    -#ifdef TO_DO_LIST
    - PHY_SetRF8225Bandwidth(Adapter, pHalData->CurrentChannelBW);
    -#endif
    break;

    case RF_8256:
    --
    2.5.1


    \
     
     \ /
      Last update: 2015-09-20 19:41    [W:2.725 / U:0.696 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site