From 2d8bfc63c4333e2c2344dbabf76f036fcf5d0d66 Mon Sep 17 00:00:00 2001
From: Govind Singh <govinds@codeaurora.org>
Date: Tue, 21 Mar 2017 13:02:00 +0530
Subject: [PATCH] qcacmn: Remove redundant header file inclusion from wmi layer

Remove redundant header file inclusion from wmi layer by abstracting
the dependency with in WMI layer.

Change-Id: Ie113b69006a960b70d781134775bc44c7508fc4c
CRs-Fixed: 2023825
---
 wmi_tlv_platform.c    |  3 +--
 wmi_unified.c         | 20 +++++++-------------
 wmi_unified_api.c     |  5 -----
 wmi_unified_non_tlv.c |  7 +------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/wmi_tlv_platform.c b/wmi_tlv_platform.c
index d7858aed6d..7e0add1ad7 100644
--- a/wmi_tlv_platform.c
+++ b/wmi_tlv_platform.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -29,7 +29,6 @@
  * LMAC offload interface functions for WMI TLV Interface
  */
 
-#include "ol_if_athvar.h"
 #include <qdf_mem.h>         /* qdf_mem_malloc,free, etc. */
 #include <osdep.h>
 #include "htc_api.h"
diff --git a/wmi_unified.c b/wmi_unified.c
index 910a3aae71..cafd7255b2 100644
--- a/wmi_unified.c
+++ b/wmi_unified.c
@@ -28,16 +28,9 @@
 /*
  * Host WMI unified implementation
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "htc_api.h"
 #include "htc_api.h"
-#include "dbglog_host.h"
 #include "wmi_unified_priv.h"
-#include "wmi_unified_param.h"
 
 #ifndef WMI_NON_TLV_SUPPORT
 #include "wmi_tlv_helper.h"
@@ -1875,11 +1868,6 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 	return "Invalid WMI cmd";
 }
 
-static inline void wma_log_cmd_id(uint32_t cmd_id, uint32_t tag)
-{
-	WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
-		 wmi_id_to_name(cmd_id), cmd_id, tag);
-}
 #else
 static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 {
@@ -1888,6 +1876,12 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 #endif
 
 #ifdef CONFIG_MCL
+static inline void wmi_log_cmd_id(uint32_t cmd_id, uint32_t tag)
+{
+	WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
+		 wmi_id_to_name(cmd_id), cmd_id, tag);
+}
+
 /**
  * wmi_is_pm_resume_cmd() - check if a cmd is part of the resume sequence
  * @cmd_id: command to check
@@ -2001,7 +1995,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf);
 #ifdef CONFIG_MCL
-	wma_log_cmd_id(cmd_id, htc_tag);
+	wmi_log_cmd_id(cmd_id, htc_tag);
 #endif
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
diff --git a/wmi_unified_api.c b/wmi_unified_api.c
index ca99db49e0..a31b327919 100644
--- a/wmi_unified_api.c
+++ b/wmi_unified_api.c
@@ -24,11 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_priv.h"
 #include "wmi_unified_param.h"
 
diff --git a/wmi_unified_non_tlv.c b/wmi_unified_non_tlv.c
index 56450131ad..d2e3b297e0 100644
--- a/wmi_unified_non_tlv.c
+++ b/wmi_unified_non_tlv.c
@@ -25,14 +25,9 @@
  * to the Linux Foundation.
  */
 
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "wlan_defs.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_api.h"
 #include "wmi_unified_priv.h"
+#include "hif.h"
 
 #if defined(WMI_NON_TLV_SUPPORT) || defined(WMI_TLV_AND_NON_TLV_SUPPORT)
 #include "wmi.h"