qcacmn: Remove OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS macro

Logs of the Spectral WMI interaction prints are under
OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS macro and is disabled by default.
As the WMI logs are already controllable at runtime from qdf_cv_lvl,
there is no need for OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS anymore.

Change-Id: I3b89192de4deb420d853631064c20add894fb1e3
CRs-Fixed: 2369846

target_if/spectral/target_if_spectral.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011,2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011,2017-2019 The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -281,7 +281,6 @@ target_if_spectral_info_init_defaults(struct target_if_spectral *spectral)
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS
 /**
  * target_if_log_read_spectral_active() - Helper function to log whether
  * spectral is active after reading cache
@@ -431,50 +430,6 @@ target_if_log_read_spectral_params_catch_validate(
 		       pparam->ss_dbm_adj, pparam->ss_chn_mask);
 }
 
-#else
-static void
-target_if_log_read_spectral_active(
-	const char *function_name,
-	unsigned char output)
-{
-}
-
-static void
-target_if_log_read_spectral_enabled(
-	const char *function_name,
-	unsigned char output)
-{
-}
-
-static void
-target_if_log_read_spectral_params(
-	const char *function_name,
-	struct spectral_config *pparam)
-{
-}
-
-static void
-target_if_log_read_spectral_active_catch_validate(
-	const char *function_name,
-	unsigned char output)
-{
-}
-
-static void
-target_if_log_read_spectral_enabled_catch_validate(
-	const char *function_name,
-	unsigned char output)
-{
-}
-
-static void
-target_if_log_read_spectral_params_catch_validate(
-	const char *function_name,
-	struct spectral_config *pparam)
-{
-}
-#endif
-
 /**
  * target_if_spectral_info_read() - Read spectral information from the cache.
  * @spectral: Pointer to Spectral target_if internal private data
@@ -636,7 +591,6 @@ target_if_spectral_info_read(
 	return 0;
 }
 
-#ifdef OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS
 /**
  * target_if_log_write_spectral_active() - Helper function to log inputs and
  * return value of call to configure the Spectral 'active' configuration,
@@ -713,32 +667,6 @@ target_if_log_write_spectral_params(
 		       param->ss_bin_scale,
 		       param->ss_dbm_adj, param->ss_chn_mask, ret);
 }
-#else
-static void
-target_if_log_write_spectral_active(
-	const char *function_name,
-	uint8_t pval,
-	int ret)
-{
-}
-
-static void
-target_if_log_write_spectral_enabled(
-	const char *function_name,
-	uint8_t pval,
-	int ret)
-{
-}
-
-static void
-target_if_log_write_spectral_params(
-	struct spectral_config *param,
-	const char *function_name,
-	int ret)
-{
-}
-
-#endif
 
 /**
  * target_if_spectral_info_write() - Write Spectral information to the

wmi/src/wmi_unified_non_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-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
@@ -2790,7 +2790,7 @@ static QDF_STATUS send_vdev_spectral_configure_cmd_non_tlv(wmi_unified_t wmi_han
 			   buf,
 			   len,
 			   WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID);
-#ifdef OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS
+
 	WMI_LOGD("%s: Sent WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID", __func__);
 
 	WMI_LOGD("vdev_id = %u\n"
@@ -2832,7 +2832,6 @@ static QDF_STATUS send_vdev_spectral_configure_cmd_non_tlv(wmi_unified_t wmi_han
 		  param->dbm_adj,
 		  param->chn_mask);
 	WMI_LOGD("%s: Status: %d", __func__, ret);
-#endif  /* OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS */
 
 	return ret;
 }
@@ -2974,10 +2973,6 @@ static QDF_STATUS send_vdev_spectral_enable_cmd_non_tlv(wmi_unified_t wmi_handle
 		cmd->enable_cmd = 0; /* 0: Ignore */
 	}
 
-#ifdef OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS
-	WMI_LOGD
-		("%s: Sent WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID\n", __func__);
-
 	WMI_LOGD("vdev_id = %u\n"
 				 "trigger_cmd = %u\n"
 				 "enable_cmd = %u",
@@ -2985,13 +2980,16 @@ static QDF_STATUS send_vdev_spectral_enable_cmd_non_tlv(wmi_unified_t wmi_handle
 				 cmd->trigger_cmd,
 				 cmd->enable_cmd);
 
-	WMI_LOGD("%s: Status: %d", __func__, ret);
-#endif /* OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS */
-
 	ret = wmi_unified_cmd_send(wmi_handle,
 				   buf,
 				   len,
 				   WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID);
+
+	WMI_LOGD
+		("%s: Sent WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID\n", __func__);
+
+	WMI_LOGD("%s: Status: %d", __func__, ret);
+
 	return ret;
 }