Browse Source

qcacld-3.0: Replace obsolete WMA_LOGP() with wma_alert()

Replace obsolete WMA_LOGP() macro with wma_alert().

Change-Id: I7e9d8048789c8deee6c3bfab72d7f9b591fca9b9
CRs-Fixed: 2716176
Srinivas Girigowda 4 years ago
parent
commit
9e0b3dbb70
5 changed files with 13 additions and 16 deletions
  1. 0 2
      core/wma/inc/wma.h
  2. 8 8
      core/wma/src/wma_data.c
  3. 1 1
      core/wma/src/wma_dev_if.c
  4. 2 3
      core/wma/src/wma_features.c
  5. 2 2
      core/wma/src/wma_mgmt.c

+ 0 - 2
core/wma/inc/wma.h

@@ -80,8 +80,6 @@
 	QDF_TRACE_WARN_NO_FL(QDF_MODULE_ID_WMA, params)
 #define WMA_LOGE(params ...) \
 	QDF_TRACE_ERROR_NO_FL(QDF_MODULE_ID_WMA, params)
-#define WMA_LOGP(params ...) \
-	QDF_TRACE_FATAL_NO_FL(QDF_MODULE_ID_WMA, params)
 
 #define wma_alert(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_WMA, params)
 #define wma_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_WMA, params)

+ 8 - 8
core/wma/src/wma_data.c

@@ -1366,7 +1366,7 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, qdf_nbuf_t netbuf,
 	/* Set the Tx Mgmt Complete Event */
 	qdf_status = qdf_event_set(&wma_handle->tx_frm_download_comp_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-		WMA_LOGP("%s: Event Set failed - tx_frm_comp_event", __func__);
+		wma_alert("Event Set failed - tx_frm_comp_event");
 }
 
 /**
@@ -2330,8 +2330,8 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 							 (void **)&pPacket);
 
 				if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-					WMA_LOGP("%s: Failed to allocate %d bytes for RMF status code (%x)",
-						__func__, newFrmLen,
+					wma_alert("Failed to allocate %d bytes for RMF status code (%x)",
+						newFrmLen,
 						qdf_status);
 					/* Free the original packet memory */
 					cds_packet_free((void *)tx_frame);
@@ -2381,8 +2381,8 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 						      (void **)&pPacket);
 
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-				WMA_LOGP("%s: Failed to allocate %d bytes for RMF status code (%x)",
-					__func__, newFrmLen,
+				wma_alert("Failed to allocate %d bytes for RMF status code (%x)",
+					newFrmLen,
 					qdf_status);
 				/* Free the original packet memory */
 				cds_packet_free((void *)tx_frame);
@@ -2572,8 +2572,8 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 				&wma_handle->tx_frm_download_comp_event);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			WMA_LOGP("%s: Event Reset failed tx comp event %x",
-				 __func__, qdf_status);
+			wma_alert("Event Reset failed tx comp event %x",
+				 qdf_status);
 			cds_packet_free((void *)tx_frame);
 			goto error;
 		}
@@ -2718,7 +2718,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 					      WMA_TX_FRAME_COMPLETE_TIMEOUT);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			WMA_LOGP("Wait Event failed txfrm_comp_event");
+			wma_nofl_alert("Wait Event failed txfrm_comp_event");
 			/*
 			 * @Integrated: Something Wrong with Dxe
 			 *   TODO: Some Debug Code

+ 1 - 1
core/wma/src/wma_dev_if.c

@@ -5123,7 +5123,7 @@ QDF_STATUS wma_send_vdev_stop(uint8_t vdev_id)
 				wma->interfaces[vdev_id].vdev,
 				WMA_SET_LINK_STATE);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		WMA_LOGP(FL("Failed to set wma req msg_type for vdev_id %d"),
+		wma_alert("Failed to set wma req msg_type for vdev_id %d",
 			 vdev_id);
 		return QDF_STATUS_E_FAILURE;
 	}

+ 2 - 3
core/wma/src/wma_features.c

@@ -1089,8 +1089,7 @@ int wma_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id)
 {
 	if (wmi_unified_csa_offload_enable(wma->wmi_handle,
 				 vdev_id)) {
-		WMA_LOGP("%s: Failed to send CSA offload enable command",
-			 __func__);
+		wma_alert("Failed to send CSA offload enable command");
 		return -EIO;
 	}
 
@@ -2851,7 +2850,7 @@ void wma_del_ts_req(tp_wma_handle wma, struct del_ts_params *msg)
 	if (wmi_unified_del_ts_cmd(wma->wmi_handle,
 				 msg->sessionId,
 				 TID_TO_WME_AC(msg->userPrio))) {
-		WMA_LOGP("%s: Failed to send vdev DELTS command", __func__);
+		wma_alert("Failed to send vdev DELTS command");
 	}
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD

+ 2 - 2
core/wma/src/wma_mgmt.c

@@ -1617,8 +1617,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 	status = wmi_unified_peer_assoc_send(wma->wmi_handle,
 					 cmd);
 	if (QDF_IS_STATUS_ERROR(status))
-		WMA_LOGP(FL("Failed to send peer assoc command status = %d"),
-			status);
+		wma_alert("Failed to send peer assoc command status = %d",
+			 status);
 	qdf_mem_free(cmd);
 
 	return status;