From e114fbf9f1f06b432d9feafbee2bc6ce113b20e2 Mon Sep 17 00:00:00 2001
From: Yun Park <yunp@codeaurora.org>
Date: Thu, 5 Apr 2018 20:02:12 -0700
Subject: [PATCH] qcacld-3.0: Remove to call IPA RM APIs for WDI UNIFIED APIs

IPA RM APIs are depricated from WDI UNIFIED APIs.
Remove to call IPA RM APIs when IPA_WDI_UNIFIED_API is enabled.

Change-Id: I4de2f16a9d320a769870efacdd0c067bab133a0a
CRs-Fixed: 2220247
---
 components/ipa/core/inc/wlan_ipa_core.h | 28 +++++++++++++++++++++++++
 components/ipa/core/src/wlan_ipa_core.c | 11 +++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/components/ipa/core/inc/wlan_ipa_core.h b/components/ipa/core/inc/wlan_ipa_core.h
index c857342d9d..0c5dade87d 100644
--- a/components/ipa/core/inc/wlan_ipa_core.h
+++ b/components/ipa/core/inc/wlan_ipa_core.h
@@ -218,6 +218,20 @@ QDF_STATUS wlan_ipa_wdi_setup_rm(struct wlan_ipa_priv *ipa_ctx);
  */
 void wlan_ipa_wdi_destroy_rm(struct wlan_ipa_priv *ipa_ctx);
 
+static inline
+int wlan_ipa_wdi_rm_notify_completion(qdf_ipa_rm_event_t event,
+				      qdf_ipa_rm_resource_name_t res_name)
+{
+	return qdf_ipa_rm_notify_completion(event, res_name);
+}
+
+static inline
+int wlan_ipa_wdi_rm_inactivity_timer_destroy(
+					qdf_ipa_rm_resource_name_t res_name)
+{
+	return qdf_ipa_rm_inactivity_timer_destroy(res_name);
+}
+
 #else /* CONFIG_IPA_WDI_UNIFIED_API */
 
 static inline
@@ -262,6 +276,20 @@ static inline QDF_STATUS wlan_ipa_wdi_rm_try_release(struct wlan_ipa_priv
 	return QDF_STATUS_SUCCESS;
 }
 
+static inline
+int wlan_ipa_wdi_rm_notify_completion(qdf_ipa_rm_event_t event,
+				      qdf_ipa_rm_resource_name_t res_name)
+{
+	return 0;
+}
+
+static inline
+int wlan_ipa_wdi_rm_inactivity_timer_destroy(
+					qdf_ipa_rm_resource_name_t res_name)
+{
+	return 0;
+}
+
 #endif /* CONFIG_IPA_WDI_UNIFIED_API */
 
 #ifdef FEATURE_METERING
diff --git a/components/ipa/core/src/wlan_ipa_core.c b/components/ipa/core/src/wlan_ipa_core.c
index 37f4e4d0e4..61cefede8a 100644
--- a/components/ipa/core/src/wlan_ipa_core.c
+++ b/components/ipa/core/src/wlan_ipa_core.c
@@ -1147,7 +1147,8 @@ static QDF_STATUS wlan_ipa_uc_handle_first_con(struct wlan_ipa_priv *ipa_ctx)
 	 * PROD resource may return sync or async manners
 	 */
 	if (wlan_ipa_is_rm_enabled(ipa_ctx->config)) {
-		if (!ipa_rm_request_resource(IPA_RM_RESOURCE_WLAN_PROD)) {
+		if (!wlan_ipa_wdi_rm_request_resource(ipa_ctx,
+						IPA_RM_RESOURCE_WLAN_PROD)) {
 			/* RM PROD request sync return
 			 * enable pipe immediately
 			 */
@@ -2399,7 +2400,7 @@ static void wlan_ipa_uc_op_cb(struct op_msg_type *op_msg,
 			}
 			wlan_ipa_uc_proc_pending_event(ipa_ctx, true);
 			if (ipa_ctx->pending_cons_req)
-				qdf_ipa_rm_notify_completion(
+				wlan_ipa_wdi_rm_notify_completion(
 						QDF_IPA_RM_RESOURCE_GRANTED,
 						QDF_IPA_RM_RESOURCE_WLAN_CONS);
 			ipa_ctx->pending_cons_req = false;
@@ -2418,8 +2419,8 @@ static void wlan_ipa_uc_op_cb(struct op_msg_type *op_msg,
 			qdf_event_set(&ipa_ctx->ipa_resource_comp);
 			wlan_ipa_uc_disable_pipes(ipa_ctx);
 			if (wlan_ipa_is_rm_enabled(ipa_ctx->config))
-				qdf_ipa_rm_release_resource(
-					QDF_IPA_RM_RESOURCE_WLAN_PROD);
+				wlan_ipa_wdi_rm_release_resource(ipa_ctx,
+						QDF_IPA_RM_RESOURCE_WLAN_PROD);
 			wlan_ipa_uc_proc_pending_event(ipa_ctx, false);
 			ipa_ctx->pending_cons_req = false;
 		}
@@ -2541,7 +2542,7 @@ QDF_STATUS wlan_ipa_uc_ol_init(struct wlan_ipa_priv *ipa_ctx,
 	status = wlan_ipa_set_perf_level(ipa_ctx, 0, 0);
 	if (status != QDF_STATUS_SUCCESS) {
 		ipa_err("Set perf level failed: %d", status);
-		qdf_ipa_rm_inactivity_timer_destroy(
+		wlan_ipa_wdi_rm_inactivity_timer_destroy(
 					QDF_IPA_RM_RESOURCE_WLAN_PROD);
 		goto fail_return;
 	}