qca-wifi: Fixes needed to enable cfr compile flag

Compilation fixes required to enable cfr compile flag

Change-Id: I0dd739a695d89a0effb6c116919ae915b2e22f0e
CRs-Fixed: 2407354

target_if/cfr/src/target_if_cfr_8074v2.c

@@ -94,7 +94,7 @@ target_if_register_to_dbr(struct wlan_objmgr_pdev *pdev)
 	dbr_tx_ops = &psoc->soc_cb.tx_ops.dbr_tx_ops;
 	if (dbr_tx_ops->direct_buf_rx_module_register) {
 		return dbr_tx_ops->direct_buf_rx_module_register
-			(pdev, DBR_MODULE_CFR,
+			(pdev, 1,
 			 cfr_dbr_event_handler);
 	}
 
@@ -126,7 +126,7 @@ int cfr_8074v2_deinit_pdev(
 {
 	int status;
 
-	status = target_if_unregister_tx_complection_event_handler(pdev);
+	status = target_if_unregister_tx_completion_event_handler(psoc);
 	return status;
 }
 

target_if/cfr/src/target_if_cfr_wifi2_0.c

@@ -302,8 +302,7 @@ cfr_wifi2_0_init_pdev(struct wlan_objmgr_psoc *psoc,
 
 			if (idx >= info->num_mem_chunks) {
 				pa->is_cfr_capable = 0;
-				qdf_print("WLAN_CSI: Shared memory not allocated
-					for CSI\n");
+				qdf_info("CFR Shared memory not allocated\n");
 				return QDF_STATUS_E_NOMEM;
 			}
 
@@ -333,7 +332,8 @@ cfr_wifi2_0_init_pdev(struct wlan_objmgr_psoc *psoc,
 
 QDF_STATUS
 cfr_wifi2_0_deinit_pdev(struct wlan_objmgr_psoc *psoc,
-			struct wlan_objmgr_pdev *pdev) {
+			struct wlan_objmgr_pdev *pdev)
+{
 
     /* TODO:No cleanup action need for now */
 	return QDF_STATUS_SUCCESS;

umac/cfr/core/inc/cfr_defs_i.h

@@ -31,18 +31,6 @@
 #include <qdf_types.h>
 #include <wlan_cfr_utils_api.h>
 
-#define cfr_log(level, args...) \
-QDF_TRACE(QDF_MODULE_ID_CFR, level, ##args)
-
-#define cfr_log_fl(level, format, args...) cfr_log(level, FL(format), ## args)
-
-#define cfr_err(format, args...) \
-	cfr_log_fl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define cfr_info(format, args...) \
-	cfr_log_fl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define cfr_debug(format, args...) \
-	cfr_log_fl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-
 /**
  * wlan_cfr_psoc_obj_create_handler() - psoc object create handler for cfr
  * @psoc - pointer to psoc object

umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -22,6 +22,21 @@
 #include <wlan_objmgr_cmn.h>
 #include <qal_streamfs.h>
 
+#define cfr_alert(format, args...) \
+		QDF_TRACE_FATAL(QDF_MODULE_ID_CFR, format, ## args)
+
+#define cfr_err(format, args...) \
+		QDF_TRACE_ERROR(QDF_MODULE_ID_CFR, format, ## args)
+
+#define cfr_warn(format, args...) \
+		QDF_TRACE_WARN(QDF_MODULE_ID_CFR, format, ## args)
+
+#define cfr_info(format, args...) \
+		QDF_TRACE_INFO(QDF_MODULE_ID_CFR, format, ## args)
+
+#define cfr_debug(format, args...) \
+		QDF_TRACE_DEBUG(QDF_MODULE_ID_CFR, format, ## args)
+
 /**
  * struct cfr_capture_params - structure to store cfr config param
  * bandwidth: bandwitdh of capture