qcacmn: Use new HIF_SNOC flag
Use new HIF_SNOC instead of assuming snoc when pci is not defined.
Exposes duplicate function defs with HIF_SNOC and HIF_PCI both defined.
Remove some trivial HIF_PCI conditional compilation.
Change-Id: I958740f49b3298c165e662b89b586bda2b3d2ee8
CRs-Fixed: 986480
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index 53c4778..a24d7bb 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -54,11 +54,7 @@
#include "epping_main.h"
#include "hif_debug.h"
#include "mp_dev.h"
-#ifdef HIF_PCI
-#include "icnss_stub.h"
-#else
-#include <soc/qcom/icnss.h>
-#endif
+#include "platform_icnss.h"
#define AGC_DUMP 1
#define CHANINFO_DUMP 2
@@ -635,7 +631,7 @@
* Return: n/a
*/
#if defined(TARGET_RAMDUMP_AFTER_KERNEL_PANIC) \
-&& defined(HIF_PCI) && defined(DEBUG)
+&& defined(DEBUG)
static void hif_crash_shutdown_dump_bus_register(void *hif_ctx)
{
@@ -660,11 +656,15 @@
void hif_crash_shutdown(struct hif_opaque_softc *hif_ctx)
{
struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
- struct HIF_CE_state *hif_state = HIF_GET_CE_STATE(hif_ctx);
- if (!hif_state)
+ if (!hif_ctx)
return;
+ if (scn->bus_type == QDF_BUS_TYPE_SNOC) {
+ HIF_INFO_MED("%s: RAM dump disabled for bustype %d",
+ __func__, scn->bus_type);
+ return;
+ }
if (OL_TRGET_STATUS_RESET == scn->target_status) {
HIF_INFO_MED("%s: Target is already asserted, ignore!",