Staging: rtxxxx: remove unused AsicAntenna{Select,Setting}()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index e374c50c752234a8b0ecbbc53bf039bbd49ad2b2..d0a3b6b70feb93048cade2e00e352da9795ab31d 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -6106,98 +6106,6 @@ VOID AsicLockChannel(
 {
 }
 
-/*
-       ==========================================================================
-       Description:
-
-       IRQL = PASSIVE_LEVEL
-       IRQL = DISPATCH_LEVEL
-
-       ==========================================================================
- */
-VOID   AsicAntennaSelect(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      UCHAR                   Channel)
-{
-#ifdef RT30xx
-                       if (pAd->Mlme.OneSecPeriodicRound % 2 == 1)
-                       {
-                               // patch for AsicSetRxAnt failed
-                               pAd->RxAnt.EvaluatePeriod = 0;
-
-                               // check every 2 second. If rcv-beacon less than 5 in the past 2 second, then AvgRSSI is no longer a
-                               // valid indication of the distance between this AP and its clients.
-                               if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED))
-                               {
-                                       SHORT   realavgrssi1;
-
-                                       // if no traffic then reset average rssi to trigger evaluation
-                                       if (pAd->StaCfg.NumOfAvgRssiSample < 5)
-                                       {
-                                               pAd->RxAnt.Pair1LastAvgRssi = (-99);
-                                               pAd->RxAnt.Pair2LastAvgRssi = (-99);
-                                               DBGPRINT(RT_DEBUG_TRACE, ("MlmePeriodicExec: no traffic/beacon, reset RSSI\n"));
-                                       }
-
-                                       pAd->StaCfg.NumOfAvgRssiSample = 0;
-                                       realavgrssi1 = (pAd->RxAnt.Pair1AvgRssi[pAd->RxAnt.Pair1PrimaryRxAnt] >> 3);
-
-                                       DBGPRINT(RT_DEBUG_TRACE,("Ant-realrssi0(%d), Lastrssi0(%d), EvaluateStableCnt=%d\n", realavgrssi1, pAd->RxAnt.Pair1LastAvgRssi, pAd->RxAnt.EvaluateStableCnt));
-
-                                       // if the difference between two rssi is larger or less than 5, then evaluate the other antenna
-                                       if ((pAd->RxAnt.EvaluateStableCnt < 2) || (realavgrssi1 > (pAd->RxAnt.Pair1LastAvgRssi + 5)) || (realavgrssi1 < (pAd->RxAnt.Pair1LastAvgRssi - 5)))
-                                       {
-                                               pAd->RxAnt.Pair1LastAvgRssi = realavgrssi1;
-                                               AsicEvaluateRxAnt(pAd);
-                                       }
-                               }
-                               else
-                               {
-                                       // if not connected, always switch antenna to try to connect
-                                       UCHAR   temp;
-
-                                       temp = pAd->RxAnt.Pair1PrimaryRxAnt;
-                                       pAd->RxAnt.Pair1PrimaryRxAnt = pAd->RxAnt.Pair1SecondaryRxAnt;
-                                       pAd->RxAnt.Pair1SecondaryRxAnt = temp;
-
-                                       DBGPRINT(RT_DEBUG_TRACE, ("MlmePeriodicExec: no connect, switch to another one to try connection\n"));
-
-                                       AsicSetRxAnt(pAd, pAd->RxAnt.Pair1PrimaryRxAnt);
-                               }
-                       }
-#endif /* RT30xx */
-}
-
-/*
-       ========================================================================
-
-       Routine Description:
-               Antenna miscellaneous setting.
-
-       Arguments:
-               pAd                                             Pointer to our adapter
-               BandState                               Indicate current Band State.
-
-       Return Value:
-               None
-
-       IRQL <= DISPATCH_LEVEL
-
-       Note:
-               1.) Frame End type control
-                       only valid for G only (RF_2527 & RF_2529)
-                       0: means DPDT, set BBP R4 bit 5 to 1
-                       1: means SPDT, set BBP R4 bit 5 to 0
-
-
-       ========================================================================
-*/
-VOID   AsicAntennaSetting(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      ABGBAND_STATE   BandState)
-{
-}
-
 VOID AsicRfTuningExec(
        IN PVOID SystemSpecific1,
        IN PVOID FunctionContext,

diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 182106472066610547b096174e5424c8494b9df5..87684948bfc7bdfb9aefa94eddd4f1d78476db1f 100644 (file)
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -1915,10 +1915,8 @@ VOID     NICInitAsicFromEEPROM(
                pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = TRUE;
        else
                pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = FALSE;
-       //
-       // Since BBP has been progamed, to make sure BBP setting will be
-       // upate inside of AsicAntennaSelect, so reset to UNKNOWN_BAND!!
-       //
+
+       /* BBP has been programmed so reset to UNKNOWN_BAND */
        pAd->CommonCfg.BandState = UNKNOWN_BAND;
 
        RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R3, &BBPR3);

diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index fd5afe1a1d26e54a391aa1f37b0927cec53bf952..5d1fb0079831c5255a0a3efff2a6402db74ae94c 100644 (file)
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -3713,14 +3713,6 @@ VOID AsicLockChannel(
        IN PRTMP_ADAPTER pAd,
        IN UCHAR Channel) ;
 
-VOID AsicAntennaSelect(
-       IN  PRTMP_ADAPTER   pAd,
-       IN  UCHAR           Channel);
-
-VOID AsicAntennaSetting(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      ABGBAND_STATE   BandState);
-
 VOID AsicRfTuningExec(
        IN PVOID SystemSpecific1,
        IN PVOID FunctionContext,