qcacld-3.0: Remove temporary hacks during bring-up

CNSS2 platform driver is the only driver which will support PCIe
bus based discrete WLAN chipsets.

Change-Id: If2d3aded36d383e2e4b0dc4ec9e6ab9e1023f2a9
CRs-fixed: 1082183

core/pld/src/pld_common.c

@@ -38,20 +38,8 @@
 #include <net/cnss.h>
 #endif
 #ifdef CONFIG_PLD_PCIE_CNSS
-/*
- * This is a hack to make sure this change can be merged before the
- * kernel defconfig change (switching to CNSS2 platform driver) merged,
- * otherwise the kernel change has to depend on this change to be merged.
- * Once the kernel change is merged, these CNSS flags can be removed
- * so that only cnss2.h is needed.
- */
-#ifdef CONFIG_CNSS
-#include <net/cnss.h>
-#endif
-#ifdef CONFIG_CNSS2
 #include <net/cnss2.h>
 #endif
-#endif
 #ifdef CONFIG_PLD_SNOC_ICNSS
 #include <soc/qcom/icnss.h>
 #endif

core/pld/src/pld_pcie.c

@@ -32,20 +32,8 @@
 #include <linux/slab.h>
 
 #ifdef CONFIG_PLD_PCIE_CNSS
-/*
- * This is a hack to make sure this change can be merged before the
- * kernel defconfig change (switching to CNSS2 platform driver) merged,
- * otherwise the kernel change has to depend on this change to be merged.
- * Once the kernel change is merged, these CNSS flags can be removed
- * so that only cnss2.h is needed.
- */
-#ifdef CONFIG_CNSS
-#include <net/cnss.h>
-#endif
-#ifdef CONFIG_CNSS2
 #include <net/cnss2.h>
 #endif
-#endif
 
 #include "pld_internal.h"
 #include "pld_pcie.h"

core/pld/src/pld_pcie.h

@@ -29,20 +29,8 @@
 #define __PLD_PCIE_H__
 
 #ifdef CONFIG_PLD_PCIE_CNSS
-/*
- * This is a hack to make sure this change can be merged before the
- * kernel defconfig change (switching to CNSS2 platform driver) merged,
- * otherwise the kernel change has to depend on this change to be merged.
- * Once the kernel change is merged, these CNSS flags can be removed
- * so that only cnss2.h is needed.
- */
-#ifdef CONFIG_CNSS
-#include <net/cnss.h>
-#endif
-#ifdef CONFIG_CNSS2
 #include <net/cnss2.h>
 #endif
-#endif
 #include "pld_internal.h"
 
 #ifndef CONFIG_PCI