From d540e70a226e937eba7afee006c8703e255203ed Mon Sep 17 00:00:00 2001
From: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
Date: Thu, 7 Mar 2019 20:11:44 +0530
Subject: [PATCH] qcacmn: Cleanup CONFIG_MCL from qdf wake lock api

In the current implementation, from qdf wake lock api, diag log api
invocation is controlled by macro CONFIG_MCL.

Aim is to clean CONFIG_MCL in qdf_lock.c

Change-Id: I16a1a46a2ebc255ed092a1fdd05f127c7e542a5e
CRs-Fixed: 2411636
---
 qdf/linux/src/qdf_lock.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/qdf/linux/src/qdf_lock.c b/qdf/linux/src/qdf_lock.c
index 6e98635391..e90727456d 100644
--- a/qdf/linux/src/qdf_lock.c
+++ b/qdf/linux/src/qdf_lock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -22,10 +22,10 @@
 #include <qdf_module.h>
 
 #include <qdf_types.h>
-#ifdef CONFIG_MCL
 #include <i_host_diag_core_event.h>
-#include <hif.h>
+#ifdef CONFIG_MCL
 #include <cds_api.h>
+#include <hif.h>
 #endif
 #include <i_qdf_lock.h>
 
@@ -290,12 +290,11 @@ qdf_export_symbol(qdf_wake_lock_create);
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0))
 QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason)
 {
-#ifdef CONFIG_MCL
 	host_diag_log_wlock(reason, qdf_wake_lock_name(lock),
-			WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT,
-			WIFI_POWER_EVENT_WAKELOCK_TAKEN);
-#endif
+			    WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT,
+			    WIFI_POWER_EVENT_WAKELOCK_TAKEN);
 	__pm_stay_awake(lock);
+
 	return QDF_STATUS_SUCCESS;
 }
 #else
@@ -350,12 +349,11 @@ qdf_export_symbol(qdf_wake_lock_timeout_acquire);
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0))
 QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason)
 {
-#ifdef CONFIG_MCL
 	host_diag_log_wlock(reason, qdf_wake_lock_name(lock),
-			WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT,
-			WIFI_POWER_EVENT_WAKELOCK_RELEASED);
-#endif
+			    WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT,
+			    WIFI_POWER_EVENT_WAKELOCK_RELEASED);
 	__pm_relax(lock);
+
 	return QDF_STATUS_SUCCESS;
 }
 #else