From e3846e4b48deab1c8a288174e616b41dc8f05e9f Mon Sep 17 00:00:00 2001
From: Houston Hoffman <hhoffman@codeaurora.org>
Date: Thu, 10 Mar 2016 11:56:31 -0800
Subject: [PATCH] qcacld-3.0: Remove ifdef HIF_PCI from ol_fw

The target defs need to be protected by a chip specific flag if
at all.  A bus flag is too generic.

Change-Id: I631b9686b69dcba0a47bf10bccf7f94ac3a4bd9c
CRs-Fixed: 986480
---
 core/bmi/src/i_ar6320v2_regtable.h | 2 --
 core/bmi/src/ol_fw.c               | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/core/bmi/src/i_ar6320v2_regtable.h b/core/bmi/src/i_ar6320v2_regtable.h
index 9022e1291d29..b3fcf2f5e5a4 100644
--- a/core/bmi/src/i_ar6320v2_regtable.h
+++ b/core/bmi/src/i_ar6320v2_regtable.h
@@ -33,7 +33,6 @@
 #define AR6320_REV2_1_REG_SIZE 0x0007F820
 #define AR6320_REV3_REG_SIZE   0x0007F820
 
-#ifdef HIF_PCI
 /*
  * Redefine the register list. To minimize the size of the array, the list must
  * obey the below format. {start0, end0}, {start1, end1}, {start2, end2}.......
@@ -603,5 +602,4 @@ static const tgt_reg_section ar6320v3_reg_table[] = {
 	{0x80000, 0x8000C},
 	{0x80010, 0x80020},
 };
-#endif
 #endif /* #ifndef _AR6320V2_DBG_REGTABLE_H_ */
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index effd599f6350..79bc5625f106 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -1427,7 +1427,6 @@ int ol_diag_read(struct hif_opaque_softc *scn, uint8_t *buffer,
 		return -EIO;
 }
 
-#ifdef HIF_PCI
 static int ol_ath_get_reg_table(uint32_t target_version,
 				tgt_reg_table *reg_table)
 {
@@ -1528,13 +1527,6 @@ static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer,
 out:
 	return result;
 }
-#else
-static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer,
-				uint32_t buffer_len)
-{
-	return -EINVAL;
-}
-#endif
 
 void ol_dump_target_memory(struct hif_opaque_softc *scn, void *memory_block)
 {