diff --git a/wmi_unified.c b/wmi_unified.c
index bb61170742..68160ec674 100644
--- a/wmi_unified.c
+++ b/wmi_unified.c
@@ -848,10 +848,11 @@ out:
  *
  * Return: none
  */
-static void wmi_debugfs_remove(wmi_unified_t wmi_handle, struct dentry *dentry
-		, int id)
+static void wmi_debugfs_remove(wmi_unified_t wmi_handle)
 {
 	int i;
+	struct dentry *dentry = wmi_handle->log_info.wmi_log_debugfs_dir;
+	int id = wmi_handle->log_info.wmi_instance_id;
 
 	if (dentry && (!(id < 0) || (id >= MAX_WMI_INSTANCES))) {
 		for (i = 0; i < NUM_DEBUG_INFOS; ++i) {
@@ -901,8 +902,7 @@ static QDF_STATUS wmi_debugfs_init(wmi_unified_t wmi_handle)
  *
  * Return: none
  */
-static void wmi_debugfs_remove(wmi_unified_t wmi_handle, struct dentry *dentry
-		, int id) { }
+static void wmi_debugfs_remove(wmi_unified_t wmi_handle) { }
 #endif /*WMI_INTERFACE_EVENT_LOGGING */
 
 int wmi_get_host_credits(wmi_unified_t wmi_handle);
@@ -2204,8 +2204,7 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle)
 
 	cancel_work_sync(&wmi_handle->rx_event_work);
 
-	wmi_debugfs_remove(wmi_handle, wmi_handle->log_info.wmi_log_debugfs_dir,
-				wmi_handle->log_info.wmi_instance_id);
+	wmi_debugfs_remove(wmi_handle);
 
 	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
 	buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c
index e64db81fab..8dc7029599 100644
--- a/wmi_unified_tlv.c
+++ b/wmi_unified_tlv.c
@@ -11530,6 +11530,7 @@ static QDF_STATUS extract_channel_hopping_event_tlv(wmi_unified_t wmi_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef WMI_INTERFACE_EVENT_LOGGING
 static bool is_management_record_tlv(uint32_t cmd_id)
 {
 	if ((cmd_id == WMI_MGMT_TX_SEND_CMDID) ||
@@ -11538,6 +11539,7 @@ static bool is_management_record_tlv(uint32_t cmd_id)
 
 	return false;
 }
+#endif
 
 struct wmi_ops tlv_ops =  {
 	.send_vdev_create_cmd = send_vdev_create_cmd_tlv,