wlan: bmi: Remove obsolete ISOC and WIFI_2_0 conditions

The qcacld driver contains a large amount of conditional compilation
that was initially added to allow the driver to support both
integrated and discrete wlan solutions.  However it has been decided
that the integrated solutions will only be supported by the prima
driver, so remove from BMI all of the conditional compilation that is
now obsolete.
- Code that is conditional upon QCA_WIFI_ISOC being defined is
  removed.
- Code that is conditional upon QCA_WIFI_ISOC not being defined is
  retained without conditional compilation.
- Code that is conditional upon QCA_WIFI_2_0 being defined is
  retained without conditional compilation.
- Code that is conditional upon QCA_WIFI_2_0 not being defined is
  removed.

Change-Id: I791435f265cbb75490ed986d09527b3d5b5f9db0
CRs-fixed: 709179

2 files changed, 3 insertions, 17 deletions

diff --git a/CORE/SERVICES/BMI/ol_fw.c b/CORE/SERVICES/BMI/ol_fw.c
index 34752b7ce235..cc9e62a70237 100644
--- a/CORE/SERVICES/BMI/ol_fw.c
+++ b/CORE/SERVICES/BMI/ol_fw.c
@@ -50,7 +50,7 @@
 #include "bin_sig.h"
 #include "ar6320v2_dbg_regtable.h"
 #include "epping_main.h"
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC) && defined(CONFIG_CNSS)
+#if  defined(CONFIG_CNSS)
 #include <net/cnss.h>
 #endif
 
@@ -820,7 +820,6 @@ u_int32_t host_interest_item_address(u_int32_t target_type, u_int32_t item_offse
 	}
 }
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 #ifdef HIF_PCI
 int dump_CE_register(struct ol_softc *scn)
 {
@@ -856,9 +855,8 @@ int dump_CE_register(struct ol_softc *scn)
 	return EOK;
 }
 #endif
-#endif
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC) && defined(CONFIG_CNSS)
+#if  defined(CONFIG_CNSS)
 static struct ol_softc *ramdump_scn;
 
 int ol_copy_ramdump(struct ol_softc *scn)
@@ -991,14 +989,12 @@ void ol_target_failure(void *instance, A_STATUS status)
 
 	scn->target_status = OL_TRGET_STATUS_RESET;
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 	if (vos_is_load_unload_in_progress(VOS_MODULE_ID_VOSS, NULL)) {
 		printk("%s: Loading/Unloading is in progress, ignore!\n",
 			__func__);
 		return;
 	}
 	vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, TRUE);
-#endif
 
 #ifdef CONFIG_CNSS
 	ret = hif_pci_check_fw_reg(scn->hif_sc);
@@ -1089,7 +1085,7 @@ void ol_target_failure(void *instance, A_STATUS status)
 	}
 #endif
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC) && defined(CONFIG_CNSS)
+#if  defined(CONFIG_CNSS)
 	/* Collect the RAM dump through a workqueue */
 	ol_schedule_ramdump_work(scn);
 #endif
@@ -1264,7 +1260,6 @@ ol_check_dataset_patch(struct ol_softc *scn, u_int32_t *address)
 	return 0;
 }
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 #ifdef HIF_PCI
 
 A_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk,
@@ -1625,17 +1620,14 @@ A_STATUS ol_patch_pll_switch(struct ol_softc * scn)
 	return status;
 }
 #endif
-#endif
 
 int ol_download_firmware(struct ol_softc *scn)
 {
 	u_int32_t param, address = 0;
 	int status = !EOK;
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 #if defined(HIF_PCI)
 	A_STATUS ret;
 #endif
-#endif
 
 #ifdef CONFIG_CNSS
 		if (0 != cnss_get_fw_files_for_target(&scn->fw_files,
@@ -1662,7 +1654,6 @@ int ol_download_firmware(struct ol_softc *scn)
 		printk("%s: Target address not known! Using 0x%x\n", __func__, address);
 	}
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 #if defined(HIF_PCI)
 	ret = ol_patch_pll_switch(scn);
 	if (ret) {
@@ -1670,7 +1661,6 @@ int ol_download_firmware(struct ol_softc *scn)
 		return -1;
 	}
 #endif
-#endif
 
 	if (scn->cal_in_flash) {
 		/* Write EEPROM or Flash data to Target RAM */
@@ -1838,7 +1828,6 @@ int ol_download_firmware(struct ol_softc *scn)
 	return status;
 }
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 #ifdef HIF_PCI
 int ol_diag_read(struct ol_softc *scn, u_int8_t *buffer,
 	u_int32_t pos, size_t count)
@@ -2063,7 +2052,6 @@ int ol_target_coredump(void *inst, void *memoryBlock, u_int32_t blockLength)
 	return ret;
 }
 #endif
-#endif
 
 #if defined(CONFIG_HL_SUPPORT)
 #define MAX_SUPPORTED_PEERS_REV1_1 9
diff --git a/CORE/SERVICES/BMI/ol_fw.h b/CORE/SERVICES/BMI/ol_fw.h
index 918034518af5..145ba4216ead 100644
--- a/CORE/SERVICES/BMI/ol_fw.h
+++ b/CORE/SERVICES/BMI/ol_fw.h
@@ -59,7 +59,6 @@
 #define VDEV_DEFAULT_STATS_UPDATE_PERIOD    500
 #define PEER_DEFAULT_STATS_UPDATE_PERIOD    500
 
-#if defined(QCA_WIFI_2_0) && !defined(QCA_WIFI_ISOC)
 /*
  * Note that not all the register locations are accessible.
  * A list of accessible target registers are specified with
@@ -103,7 +102,6 @@ void ol_schedule_ramdump_work(struct ol_softc *scn);
 void ol_schedule_fw_indication_work(struct ol_softc *scn);
 int ol_copy_ramdump(struct ol_softc *scn);
 int dump_CE_register(struct ol_softc *scn);
-#endif
 int ol_download_firmware(struct ol_softc *scn);
 int ol_configure_target(struct ol_softc *scn);
 void ol_target_failure(void *instance, A_STATUS status);