wlan: Remove INTEGRATION_READY and GEN6_ONWARDS flags

Removed conditional flags in qcacld driver so that conditional
compilation is now unconditional. Also, code that is conditional
on these 2 flags being NOT defined is now removed

Change-Id: I5edff28ec3e643c678e9b856d1f602bffe1de686
CRs-fixed: 698872

3 files changed, 0 insertions, 59 deletions

diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c
index 15b9cf40d4fa..fa663f52b705 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -60,10 +60,8 @@
 #include "limTrace.h"
 #include "limUtils.h"
 #include "VossWrapper.h"
-#ifdef INTEGRATION_READY
 #include "vos_status.h" //VOS_STATUS
 #include "vos_mq.h"     //vos_mq_post_message()
-#endif
 
 #include "wlan_qct_wda.h"
 
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 194a99c5b722..fb897f87e87a 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -405,67 +405,12 @@ eHalStatus pmcClose (tHalHandle hHal)
 eHalStatus pmcSignalPowerEvent (tHalHandle hHal, tPmcPowerEvent event)
 {
     tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-#ifndef GEN6_ONWARDS
-    tSirMacHTMIMOPowerSaveState  htMimoPowerSaveState;
-#endif
 
     pmcLog(pMac, LOG2, FL("Entering pmcSignalPowerEvent, event %d"), event);
 
     /* Take action based on the event being signaled. */
     switch (event)
     {
-#ifndef GEN6_ONWARDS
-    case ePMC_SYSTEM_HIBERNATE:
-        return pmcEnterLowPowerState(hHal);
-
-    case ePMC_SYSTEM_RESUME:
-        return pmcExitLowPowerState(hHal);
-
-    case ePMC_HW_WLAN_SWITCH_OFF:
-        pMac->pmc.hwWlanSwitchState = ePMC_SWITCH_OFF;
-        return pmcEnterLowPowerState(hHal);
-
-    case ePMC_HW_WLAN_SWITCH_ON:
-        pMac->pmc.hwWlanSwitchState = ePMC_SWITCH_ON;
-        return pmcExitLowPowerState(hHal);
-
-    case ePMC_SW_WLAN_SWITCH_OFF:
-        pMac->pmc.swWlanSwitchState = ePMC_SWITCH_OFF;
-        return pmcEnterLowPowerState(hHal);
-
-    case ePMC_SW_WLAN_SWITCH_ON:
-        pMac->pmc.swWlanSwitchState = ePMC_SWITCH_ON;
-        return pmcExitLowPowerState(hHal);
-
-    case ePMC_BATTERY_OPERATION:
-        pMac->pmc.powerSource = BATTERY_POWER;
-
-        /* Turn on SMPS. */
-        if (pMac->pmc.smpsEnabled)
-        {
-            if (pMac->pmc.smpsConfig.mode == ePMC_DYNAMIC_SMPS)
-                htMimoPowerSaveState = eSIR_HT_MIMO_PS_DYNAMIC;
-            if (pMac->pmc.smpsConfig.mode == ePMC_STATIC_SMPS)
-                htMimoPowerSaveState = eSIR_HT_MIMO_PS_STATIC;
-            if (pmcSendMessage(hHal, eWNI_PMC_SMPS_STATE_IND, &htMimoPowerSaveState,
-                               sizeof(tSirMacHTMIMOPowerSaveState)) != eHAL_STATUS_SUCCESS)
-                return eHAL_STATUS_FAILURE;
-        }
-        return eHAL_STATUS_SUCCESS;
-
-    case ePMC_AC_OPERATION:
-        pMac->pmc.powerSource = AC_POWER;
-
-        /* Turn off SMPS. */
-        if (!pMac->pmc.smpsConfig.enterOnAc)
-        {
-            htMimoPowerSaveState = eSIR_HT_MIMO_PS_NO_LIMIT;
-            if (pmcSendMessage(hHal, eWNI_PMC_SMPS_STATE_IND, &htMimoPowerSaveState,
-                               sizeof(tSirMacHTMIMOPowerSaveState)) != eHAL_STATUS_SUCCESS)
-                return eHAL_STATUS_FAILURE;
-        }
-        return eHAL_STATUS_SUCCESS;
-#endif //GEN6_ONWARDS
     default:
         pmcLog(pMac, LOGE, FL("Invalid event %d"), event);
         PMC_ABORT;
diff --git a/Kbuild b/Kbuild
index b0e30052fe34..330fbc980f92 100644
--- a/Kbuild
+++ b/Kbuild
@@ -986,9 +986,7 @@ EXTRA_CFLAGS += $(INCS)
 CDEFINES :=	-DANI_LITTLE_BYTE_ENDIAN \
 		-DANI_LITTLE_BIT_ENDIAN \
 		-DQC_WLAN_CHIPSET_QCA_CLD \
-		-DINTEGRATION_READY \
 		-DDOT11F_LITTLE_ENDIAN_HOST \
-		-DGEN6_ONWARDS \
 		-DANI_COMPILER_TYPE_GCC \
 		-DANI_OS_TYPE_ANDROID=6 \
 		-DANI_LOGDUMP \