From f7aea120bf64955874f28f0333bd7794fdf7d9cc Mon Sep 17 00:00:00 2001
From: Yuanyuan Liu <yuanliu@codeaurora.org>
Date: Wed, 25 May 2016 16:39:40 -0700
Subject: [PATCH] qcacld-3.0: Re-organize header file including structure

Include pld_common.h in pld_internal.h as it uses data structures
defined in pld_common.h.

CRs-Fixed: 1022636
Change-Id: I17f8abfbec08b620be5af677e1599554c5fc7ea6
---
 core/pld/src/pld_common.c   | 2 --
 core/pld/src/pld_internal.h | 2 ++
 core/pld/src/pld_pcie.c     | 1 -
 core/pld/src/pld_pcie.h     | 2 +-
 core/pld/src/pld_snoc.c     | 1 -
 core/pld/src/pld_snoc.h     | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/pld/src/pld_common.c b/core/pld/src/pld_common.c
index 89dcdd9ef3a5..e25ba7a7bb47 100644
--- a/core/pld/src/pld_common.c
+++ b/core/pld/src/pld_common.c
@@ -43,8 +43,6 @@
 
 #include "pld_pcie.h"
 #include "pld_snoc.h"
-#include "pld_common.h"
-#include "pld_internal.h"
 
 #define PLD_PCIE_REGISTERED BIT(0)
 #define PLD_SNOC_REGISTERED BIT(1)
diff --git a/core/pld/src/pld_internal.h b/core/pld/src/pld_internal.h
index b846f2ca0897..315fb6f07a67 100644
--- a/core/pld/src/pld_internal.h
+++ b/core/pld/src/pld_internal.h
@@ -28,6 +28,8 @@
 #ifndef __PLD_COMMON_I_H__
 #define __PLD_COMMON_I_H__
 
+#include "pld_common.h"
+
 struct dev_node {
 	struct device *dev;
 	struct list_head list;
diff --git a/core/pld/src/pld_pcie.c b/core/pld/src/pld_pcie.c
index c4cb5fc23dc5..0022f660dd3c 100644
--- a/core/pld/src/pld_pcie.c
+++ b/core/pld/src/pld_pcie.c
@@ -35,7 +35,6 @@
 #include <net/cnss.h>
 #endif
 
-#include "pld_common.h"
 #include "pld_internal.h"
 
 #ifdef CONFIG_PCI
diff --git a/core/pld/src/pld_pcie.h b/core/pld/src/pld_pcie.h
index 8b92fd167c76..a36c316ccd76 100644
--- a/core/pld/src/pld_pcie.h
+++ b/core/pld/src/pld_pcie.h
@@ -28,7 +28,7 @@
 #ifndef __PLD_PCIE_H__
 #define __PLD_PCIE_H__
 
-#include "pld_common.h"
+#include "pld_internal.h"
 
 #ifndef CONFIG_PCI
 static inline int pld_pcie_register_driver(void)
diff --git a/core/pld/src/pld_snoc.c b/core/pld/src/pld_snoc.c
index b21e1b9c9e90..131f030fe722 100644
--- a/core/pld/src/pld_snoc.c
+++ b/core/pld/src/pld_snoc.c
@@ -34,7 +34,6 @@
 #include <soc/qcom/icnss.h>
 #endif
 
-#include "pld_common.h"
 #include "pld_internal.h"
 
 #ifdef CONFIG_PLD_SNOC_ICNSS
diff --git a/core/pld/src/pld_snoc.h b/core/pld/src/pld_snoc.h
index 73e0f4f2a478..3123bd1f83fa 100644
--- a/core/pld/src/pld_snoc.h
+++ b/core/pld/src/pld_snoc.h
@@ -28,7 +28,7 @@
 #ifndef __PLD_SNOC_H__
 #define __PLD_SNOC_H__
 
-#include "pld_common.h"
+#include "pld_internal.h"
 
 #ifndef CONFIG_PLD_SNOC_ICNSS
 static inline int pld_snoc_register_driver(void)