ソースを参照

qcacld-3.0: Replace obsolete WMA_LOGW() with wma_warn()

Replace obsolete WMA_LOGW() macro with wma_warn().

Change-Id: I4257ccf22bfa45465ffbd44a7ef5b5712ebb754f
CRs-Fixed: 2718987
Srinivas Girigowda 4 年 前
コミット
68c954548f

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

@@ -76,8 +76,6 @@
 /* Deprecated logging macros, to be removed. Please do not use in new code */
 #define WMA_LOGI(params ...) \
 	QDF_TRACE_INFO_NO_FL(QDF_MODULE_ID_WMA, params)
-#define WMA_LOGW(params ...) \
-	QDF_TRACE_WARN_NO_FL(QDF_MODULE_ID_WMA, params)
 #define WMA_LOGE(params ...) \
 	QDF_TRACE_ERROR_NO_FL(QDF_MODULE_ID_WMA, params)
 

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

@@ -1963,7 +1963,7 @@ static uint8_t wma_thermal_mgmt_get_level(void *handle, uint32_t temp)
 		level = i;
 	}
 
-	WMA_LOGW("Change thermal level from %d -> %d\n",
+	wma_warn("Change thermal level from %d -> %d",
 		 wma->thermal_mgmt_info.thermalCurrLevel, level);
 
 	return level;

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

@@ -3258,7 +3258,7 @@ wma_vdev_set_bss_params(tp_wma_handle wma, int vdev_id,
 		WMA_LOGE("failed to set WMI_VDEV_PARAM_DTIM_PERIOD");
 
 	if (!maxTxPower)
-		WMA_LOGW("Setting Tx power limit to 0");
+		wma_warn("Setting Tx power limit to 0");
 
 	wma_nofl_debug("TXP[W][set_bss_params]: %d", maxTxPower);
 
@@ -4786,7 +4786,7 @@ static void wma_wait_tx_complete(tp_wma_handle wma,
 				    CDP_TX_PENDING, &val))
 		return;
 	while (val.cdp_pdev_param_tx_pending && max_wait_iterations) {
-		WMA_LOGW(FL("Waiting for outstanding packet to drain."));
+		wma_warn("Waiting for outstanding packet to drain");
 		qdf_wait_for_event_completion(&wma->tx_queue_empty_event,
 				      WMA_TX_Q_RECHECK_TIMER_WAIT);
 		if (cdp_txrx_get_pdev_param(
@@ -5080,7 +5080,7 @@ QDF_STATUS wma_set_wlm_latency_level(void *wma_ptr,
 	ret = wmi_unified_wlm_latency_level_cmd(wma->wmi_handle,
 						latency_params);
 	if (QDF_IS_STATUS_ERROR(ret))
-		WMA_LOGW("Failed to set latency level");
+		wma_warn("Failed to set latency level");
 
 	return ret;
 }

+ 3 - 3
core/wma/src/wma_main.c

@@ -2078,9 +2078,9 @@ static int wma_flush_complete_evt_handler(void *handle,
 	/* Asynchronous flush event for fatal event,
 	 * but, report in progress already
 	 */
-	WMA_LOGW("%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d",
-			__func__, WLAN_LOG_TYPE_FATAL,
-			WLAN_LOG_INDICATOR_FIRMWARE, reason_code);
+	wma_warn("Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d",
+		WLAN_LOG_TYPE_FATAL,
+		WLAN_LOG_INDICATOR_FIRMWARE, reason_code);
 	return QDF_STATUS_E_FAILURE;
 }
 

+ 4 - 5
core/wma/src/wma_mgmt.c

@@ -407,8 +407,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 			 * In future implementation, roaming module will also
 			 * handle this event and perform a scan.
 			 */
-			WMA_LOGW("%s: WMI_PEER_STA_KICKOUT_REASON_UNSPECIFIED event for STA",
-				__func__);
+			wma_warn("WMI_PEER_STA_KICKOUT_REASON_UNSPECIFIED event for STA");
 			wma_beacon_miss_handler(wma, vdev_id,
 						kickout_event->rssi);
 			goto exit_handler;
@@ -1343,8 +1342,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 
 	if ((phymode == WLAN_PHYMODE_11A && num_peer_11a_rates == 0) ||
 	    (phymode == WLAN_PHYMODE_11B && num_peer_11b_rates == 0)) {
-		WMA_LOGW("%s: Invalid phy rates. phymode 0x%x, 11b_rates %d, 11a_rates %d",
-			__func__, phymode, num_peer_11b_rates,
+		wma_warn("Invalid phy rates. phymode 0x%x, 11b_rates %d, 11a_rates %d",
+			phymode, num_peer_11b_rates,
 			num_peer_11a_rates);
 		qdf_mem_free(cmd);
 		return QDF_STATUS_E_INVAL;
@@ -1379,7 +1378,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 		 */
 
 		/* TODO: Do we really need this? */
-		WMA_LOGW("Peer is marked as HT capable but supported mcs rate is 0");
+		wma_warn("Peer is marked as HT capable but supported mcs rate is 0");
 		peer_ht_rates.num_rates = sizeof(temp_ni_rates);
 		qdf_mem_copy((uint8_t *) peer_ht_rates.rates, temp_ni_rates,
 			     peer_ht_rates.num_rates);

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

@@ -5202,7 +5202,7 @@ int wma_extscan_cached_results_event_handler(void *handle,
 			event->num_entries_in_page);
 
 	if (!src_hotlist || !src_rssi || !event->num_entries_in_page) {
-		WMA_LOGW("%s: Cached results empty, send 0 results", __func__);
+		wma_warn("Cached results empty, send 0 results");
 		goto noresults;
 	}