qcacld: pmc: Remove obsolete vos_power code

The APIs exposed by vos_power are not applicable to the current
driver, so remove all references to them to help clean up the
codebase.

Change-Id: I0a9051db95867a3ff1990e9c5095c2ecbbd8bd27
CRs-fixed: 651119

3 files changed, 4 insertions, 109 deletions

diff --git a/CORE/SME/inc/pmc.h b/CORE/SME/inc/pmc.h
index 59ea1a3a4921..2d9b151fdf73 100644
--- a/CORE/SME/inc/pmc.h
+++ b/CORE/SME/inc/pmc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -188,7 +188,6 @@ typedef struct sPmcInfo
     void *enterWowlCallbackContext;/* value to be passed as parameter to routine specified above */
     tSirSmeWowlEnterParams wowlEnterParams; /* WOWL mode configuration */
     tDblLinkList deferredMsgList;   //The message in here are deferred and DONOT expect response from PE
-    tANI_BOOLEAN rfSuppliesVotedOff;  //Whether RF supplies are voted off or not.
 #ifdef FEATURE_WLAN_SCAN_PNO
     preferredNetworkFoundIndCallback  prefNetwFoundCB; /* routine to call for Preferred Network Found Indication */
     void *preferredNetworkFoundIndCallbackContext;/* value to be passed as parameter to routine specified above */
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index 1daa33f8a9b1..60e4e7e22020 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -47,7 +47,6 @@
 #include "pmc.h"
 #include "wlan_qct_wda.h"
 #include "wlan_ps_wow_diag.h"
-#include <vos_power.h>
 #include "csrInsideApi.h"
 
 static void pmcProcessDeferredMsg( tpAniSirGlobal pMac );
@@ -206,12 +205,7 @@ eHalStatus pmcEnterFullPowerState (tHalHandle hHal)
         return eHAL_STATUS_FAILURE;
     }
 
-    pmcLog(pMac, LOG1, "PMC: Enter full power done: Cancel XO Core ON vote");
-    if (vos_chipVoteXOCore(NULL, NULL, NULL, VOS_FALSE) != VOS_STATUS_SUCCESS)
-    {
-        pmcLog(pMac, LOGE, "Could not cancel XO Core ON vote. Not returning failure. "
-                                "Power consumed will be high");
-    }
+    pmcLog(pMac, LOG1, "PMC: Enter full power done");
 
     return eHAL_STATUS_SUCCESS;
 }
@@ -236,8 +230,6 @@ eHalStatus pmcEnterFullPowerState (tHalHandle hHal)
 eHalStatus pmcEnterRequestFullPowerState (tHalHandle hHal, tRequestFullPowerReason fullPowerReason)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-    vos_call_status_type callType;
-    VOS_STATUS status;
 
     pmcLog(pMac, LOG2, FL("Entering pmcEnterRequestFullPowerState"));
 
@@ -276,25 +268,6 @@ eHalStatus pmcEnterRequestFullPowerState (tHalHandle hHal, tRequestFullPowerReas
 
     /* Tell MAC to have device enter full power mode. */
     case IMPS:
-        if ( pMac->pmc.rfSuppliesVotedOff )
-        {
-            status = vos_chipVoteOnRFSupply(&callType, NULL, NULL);
-            if(VOS_STATUS_SUCCESS != status)
-            {
-                VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-                return eHAL_STATUS_FAILURE;
-            }
-
-            status = vos_chipVoteOnXOBuffer(&callType, NULL, NULL);
-            if(VOS_STATUS_SUCCESS != status)
-            {
-                VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-                return eHAL_STATUS_FAILURE;
-            }
-
-            pMac->pmc.rfSuppliesVotedOff = FALSE;
-        }
-
         if (pmcIssueCommand( pMac, 0, eSmeCommandExitImps, NULL, 0, FALSE)
                             != eHAL_STATUS_SUCCESS)
         {
@@ -321,22 +294,6 @@ eHalStatus pmcEnterRequestFullPowerState (tHalHandle hHal, tRequestFullPowerReas
 
     /* Tell MAC to have device enter full power mode. */
     case STANDBY:
-        if ( pMac->pmc.rfSuppliesVotedOff )
-        {
-            status = vos_chipVoteOnXOBuffer(&callType, NULL, NULL);
-            if(VOS_STATUS_SUCCESS != status)
-            {
-                return eHAL_STATUS_FAILURE;
-            }
-            status = vos_chipVoteOnRFSupply(&callType, NULL, NULL);
-            if(VOS_STATUS_SUCCESS != status)
-            {
-                return eHAL_STATUS_FAILURE;
-            }
-
-            pMac->pmc.rfSuppliesVotedOff = FALSE;
-        }
-
         if (pmcIssueCommand(hHal, 0,  eSmeCommandExitImps, NULL, 0, FALSE)
                             != eHAL_STATUS_SUCCESS)
         {
@@ -446,8 +403,7 @@ eHalStatus pmcEnterRequestImpsState (tHalHandle hHal)
 eHalStatus pmcEnterImpsState (tHalHandle hHal)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-    vos_call_status_type callType;
-    VOS_STATUS status;
+
     pmcLog(pMac, LOG2, FL("Entering pmcEnterImpsState"));
 
     /* Can enter IMPS State only from Request IMPS State. */
@@ -493,24 +449,6 @@ eHalStatus pmcEnterImpsState (tHalHandle hHal)
         pMac->pmc.ImpsReqTimerfailCnt = 0;
     }
 
-    //Vote off RF supplies. Note RF supllies are not voted off if there is a
-    //pending request for full power already
-    status = vos_chipVoteOffRFSupply(&callType, NULL, NULL);
-    if (VOS_STATUS_SUCCESS != status )
-    {
-       VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-       return eHAL_STATUS_FAILURE;
-    }
-
-    status = vos_chipVoteOffXOBuffer(&callType, NULL, NULL);
-    if (VOS_STATUS_SUCCESS != status)
-    {
-       VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-       return eHAL_STATUS_FAILURE;
-    }
-
-    pMac->pmc.rfSuppliesVotedOff= TRUE;
-
     return eHAL_STATUS_SUCCESS;
 }
 
@@ -1486,8 +1424,6 @@ eHalStatus pmcEnterRequestStandbyState (tHalHandle hHal)
 eHalStatus pmcEnterStandbyState (tHalHandle hHal)
 {
    tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-   vos_call_status_type callType;
-   VOS_STATUS status;
 
    pmcLog(pMac, LOG2, "PMC: entering pmcEnterStandbyState");
 
@@ -1510,26 +1446,6 @@ eHalStatus pmcEnterStandbyState (tHalHandle hHal)
       return pmcEnterRequestFullPowerState(hHal, pMac->pmc.requestFullPowerReason);
    }
 
-   //Note that RF supplies are not voted off if there is already a pending request
-   //for full power
-   status = vos_chipVoteOffRFSupply(&callType, NULL, NULL);
-
-   if (VOS_STATUS_SUCCESS != status)
-   {
-      VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-      return eHAL_STATUS_FAILURE;
-   }
-
-   status = vos_chipVoteOffXOBuffer(&callType, NULL, NULL);
-
-   if (VOS_STATUS_SUCCESS != status)
-   {
-      VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ) );
-      return eHAL_STATUS_FAILURE;
-   }
-
-   pMac->pmc.rfSuppliesVotedOff= TRUE;
-
    return eHAL_STATUS_SUCCESS;
 }
 
@@ -2206,7 +2122,6 @@ eHalStatus pmcIssueCommand( tpAniSirGlobal pMac, tANI_U32 sessionId,
 tANI_BOOLEAN pmcProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
 {
     eHalStatus status = eHAL_STATUS_SUCCESS;
-    VOS_STATUS vstatus;
     tANI_BOOLEAN fRemoveCmd = eANI_BOOLEAN_TRUE;
 
     do
@@ -2280,14 +2195,7 @@ tANI_BOOLEAN pmcProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                 {
                     /* Change PMC state */
                     pMac->pmc.pmcState = REQUEST_BMPS;
-                    pmcLog(pMac, LOG2, "PMC: Enter BMPS req done: Force XO Core ON");
-                    vstatus = vos_chipVoteXOCore(NULL, NULL, NULL, VOS_TRUE);
-                    if ( !VOS_IS_STATUS_SUCCESS(vstatus) )
-                    {
-                        pmcLog(pMac, LOGE, "Could not turn XO Core ON. Can't go to BMPS");
-                    }
-                    else /* XO Core turn ON was successful */
-                    {
+                    pmcLog(pMac, LOG2, "PMC: Enter BMPS req done");
                     /* Tell MAC to have device enter BMPS mode. */
                     status = pmcSendMessage(pMac, eWNI_PMC_ENTER_BMPS_REQ, NULL, 0);
                     if ( HAL_STATUS_SUCCESS( status ) )
@@ -2297,17 +2205,6 @@ tANI_BOOLEAN pmcProcessCommand( tpAniSirGlobal pMac, tSmeCmd *pCommand )
                     else
                     {
                         pmcLog(pMac, LOGE, "Fail to send enter BMPS msg to PE");
-                            /* Cancel the vote for XO Core */
-                            pmcLog(pMac, LOGW, "In module init: Cancel the vote for XO CORE ON "
-                                                             "since send enter bmps failed");
-                            if (vos_chipVoteXOCore(NULL, NULL, NULL, VOS_FALSE) != VOS_STATUS_SUCCESS)
-                            {
-                                pmcLog(pMac, LOGE, "Could not cancel XO Core ON vote."
-                                                   "Not returning failure."
-                                                   "Power consumed will be high");
-                            }
-
-                        }
                     }
                 }
                 if( !HAL_STATUS_SUCCESS( status ) )
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 697261f15c3c..fddb5a37affd 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -94,7 +94,6 @@ eHalStatus pmcOpen (tHalHandle hHal)
     pMac->pmc.bmpsEnabled = TRUE;
     pMac->pmc.standbyEnabled = TRUE;
     pMac->pmc.wowlEnabled = TRUE;
-    pMac->pmc.rfSuppliesVotedOff= FALSE;
 
     vos_mem_set(&(pMac->pmc.bmpsConfig), sizeof(tPmcBmpsConfigParams), 0);
     vos_mem_set(&(pMac->pmc.impsConfig), sizeof(tPmcImpsConfigParams), 0);