Merge "qca-wifi: WMI_LOGI() with wmi_* appropriate log level"

wmi/src/wmi_unified_ap_tlv.c

@@ -481,10 +481,10 @@ send_packet_power_info_get_cmd_tlv(wmi_unified_t wmi_handle,
 	cmd->preamble = param->preamble;
 	cmd->hw_rate = param->hw_rate;
 
-	WMI_LOGI("%s[%d] commandID %d, wmi_pdev_get_tpc_cmd=0x%x,"
-		"rate_flags: 0x%x, nss: %d, preamble: %d, hw_rate: %d",
-		__func__, __LINE__, WMI_PDEV_GET_TPC_CMDID, *((u_int32_t *)cmd),
-		cmd->rate_flags, cmd->nss, cmd->preamble, cmd->hw_rate);
+	wmi_info("commandID %d, wmi_pdev_get_tpc_cmd=0x%x,"
+		 "rate_flags: 0x%x, nss: %d, preamble: %d, hw_rate: %d",
+		 WMI_PDEV_GET_TPC_CMDID, *((u_int32_t *)cmd),
+		 cmd->rate_flags, cmd->nss, cmd->preamble, cmd->hw_rate);
 
 	wmi_mtrace(WMI_PDEV_GET_TPC_CMDID, NO_SESSION, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmibuf, len,
@@ -1171,11 +1171,11 @@ static QDF_STATUS send_multiple_vdev_restart_req_cmd_tlv(
 	cmd->cac_duration_ms = param->cac_duration_ms;
 	cmd->num_vdevs = param->num_vdevs;
 
-	WMI_LOGI("%s:cmd->pdev_id: %d ,cmd->requestor_id: %d ,"
-		"cmd->disable_hw_ack: %d , cmd->cac_duration_ms:%d ,"
-		" cmd->num_vdevs: %d ",
-		__func__, cmd->pdev_id, cmd->requestor_id,
-		cmd->disable_hw_ack, cmd->cac_duration_ms, cmd->num_vdevs);
+	wmi_info("cmd->pdev_id: %d ,cmd->requestor_id: %d ,"
+		 "cmd->disable_hw_ack: %d , cmd->cac_duration_ms:%d ,"
+		 " cmd->num_vdevs: %d ",
+		 cmd->pdev_id, cmd->requestor_id,
+		 cmd->disable_hw_ack, cmd->cac_duration_ms, cmd->num_vdevs);
 	buf_ptr += sizeof(*cmd);
 
 	WMITLV_SET_HDR(buf_ptr,
@@ -1218,19 +1218,19 @@ static QDF_STATUS send_multiple_vdev_restart_req_cmd_tlv(
 	WMI_SET_CHANNEL_REG_CLASSID(chan_info, tchan_info->reg_class_id);
 	WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, tchan_info->maxregpower);
 
-	WMI_LOGI("%s:tchan_info->is_chan_passive: %d ,"
-		"tchan_info->dfs_set : %d ,tchan_info->allow_vht:%d ,"
-		"tchan_info->allow_ht: %d ,tchan_info->antennamax: %d ,"
-		"tchan_info->phy_mode: %d ,tchan_info->minpower: %d,"
-		"tchan_info->maxpower: %d ,tchan_info->maxregpower: %d ,"
-		"tchan_info->reg_class_id: %d ,"
-		"tchan_info->maxregpower : %d ", __func__,
-		tchan_info->is_chan_passive, tchan_info->dfs_set,
-		tchan_info->allow_vht, tchan_info->allow_ht,
-		tchan_info->antennamax, tchan_info->phy_mode,
-		tchan_info->minpower, tchan_info->maxpower,
-		tchan_info->maxregpower, tchan_info->reg_class_id,
-		tchan_info->maxregpower);
+	wmi_info("tchan_info->is_chan_passive: %d ,"
+		 "tchan_info->dfs_set : %d ,tchan_info->allow_vht:%d ,"
+		 "tchan_info->allow_ht: %d ,tchan_info->antennamax: %d ,"
+		 "tchan_info->phy_mode: %d ,tchan_info->minpower: %d,"
+		 "tchan_info->maxpower: %d ,tchan_info->maxregpower: %d ,"
+		 "tchan_info->reg_class_id: %d ,"
+		 "tchan_info->maxregpower : %d ",
+		 tchan_info->is_chan_passive, tchan_info->dfs_set,
+		 tchan_info->allow_vht, tchan_info->allow_ht,
+		 tchan_info->antennamax, tchan_info->phy_mode,
+		 tchan_info->minpower, tchan_info->maxpower,
+		 tchan_info->maxregpower, tchan_info->reg_class_id,
+		 tchan_info->maxregpower);
 
 	buf_ptr += sizeof(*chan_info);
 	WMITLV_SET_HDR(buf_ptr,
@@ -1712,10 +1712,10 @@ static QDF_STATUS set_rx_pkt_type_routing_tag_update_tlv(
 	cmd->dest_ring = param->dest_ring;
 	cmd->meta_data = param->meta_data;
 	cmd->dest_ring_handler = param->dest_ring_handler;
-	WMI_LOGI("Set RX PKT ROUTING TYPE TAG - opcode: %u", param->op_code);
-	WMI_LOGI("routing_bitmap: %u, dest_ring: %u",
+	wmi_info("Set RX PKT ROUTING TYPE TAG - opcode: %u", param->op_code);
+	wmi_info("routing_bitmap: %u, dest_ring: %u",
 		 param->routing_type_bitmap, param->dest_ring);
-	WMI_LOGI("dest_ring_handler: %u, meta_data: 0x%x",
+	wmi_info("dest_ring_handler: %u, meta_data: 0x%x",
 		 param->dest_ring_handler, param->meta_data);
 
 	wmi_mtrace(WMI_PDEV_UPDATE_PKT_ROUTING_CMDID, cmd->pdev_id, 0);
@@ -1847,7 +1847,7 @@ send_vdev_fils_enable_cmd_tlv(wmi_unified_t wmi_handle,
 	cmd->vdev_id = param->vdev_id;
 	cmd->fd_period = param->fd_period;
 	cmd->flags = param->send_prb_rsp_frame;
-	WMI_LOGI("Setting FD period to %d vdev id : %d",
+	wmi_info("Setting FD period to %d vdev id : %d",
 		 param->fd_period, param->vdev_id);
 
 	wmi_mtrace(WMI_ENABLE_FILS_CMDID, cmd->vdev_id, 0);

wmi/src/wmi_unified_non_tlv.c

@@ -7141,13 +7141,13 @@ static QDF_STATUS extract_host_mem_req_non_tlv(wmi_unified_t wmi_handle,
 			}
 		}
 
-		WMI_LOGI("idx %d req %d  num_units %d num_unit_info %d"
-				"unit size %d actual units %d",
-				idx, mem_reqs->req_id,
-				mem_reqs->num_units,
-				mem_reqs->num_unit_info,
-				mem_reqs->unit_size,
-				mem_reqs->tgt_num_units);
+		wmi_info("idx %d req %d  num_units %d num_unit_info %d"
+			 "unit size %d actual units %d",
+			 idx, mem_reqs->req_id,
+			 mem_reqs->num_units,
+			 mem_reqs->num_unit_info,
+			 mem_reqs->unit_size,
+			 mem_reqs->tgt_num_units);
 
 	}
 
@@ -9913,7 +9913,7 @@ static QDF_STATUS send_mvr_cmd(
 	cmd->disable_hw_ack = param->disable_hw_ack;
 	cmd->num_vdevs = param->num_vdevs;
 
-	WMI_LOGI("req_id:%d dis_hw_ack:%d num_vdevs:%d",
+	wmi_info("req_id:%d dis_hw_ack:%d num_vdevs:%d",
 		 cmd->requestor_id, cmd->disable_hw_ack, cmd->num_vdevs);
 
 	for (i = 0; i < param->num_vdevs; i++)
@@ -9947,13 +9947,13 @@ static QDF_STATUS send_mvr_cmd(
 	WMI_SET_CHANNEL_REG_CLASSID(chan_info, tchan_info->reg_class_id);
 	WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, tchan_info->maxregpower);
 
-	WMI_LOGI("is_chan_passive:%d dfs_set:%d allow_vht:%d allow_ht:%d",
+	wmi_info("is_chan_passive:%d dfs_set:%d allow_vht:%d allow_ht:%d",
 		 tchan_info->is_chan_passive, tchan_info->dfs_set,
 		 tchan_info->allow_vht, tchan_info->allow_ht);
-	WMI_LOGI("antennamax:%d phy_mode:%d minpower:%d maxpower:%d",
+	wmi_info("antennamax:%d phy_mode:%d minpower:%d maxpower:%d",
 		 tchan_info->antennamax, tchan_info->phy_mode,
 		 tchan_info->minpower, tchan_info->maxpower);
-	WMI_LOGI("maxregpower:%d reg_class_id:%d",
+	wmi_info("maxregpower:%d reg_class_id:%d",
 		 tchan_info->maxregpower, tchan_info->reg_class_id);
 
 	ret = wmi_unified_cmd_send(
@@ -10013,7 +10013,7 @@ static QDF_STATUS send_mvr_ext_cmd(
 	cmd->requestor_id = param->requestor_id;
 	cmd->disable_hw_ack = param->disable_hw_ack;
 
-	WMI_LOGI("req_id:%d dis_hw_ack:%d",
+	wmi_info("req_id:%d dis_hw_ack:%d",
 		 cmd->requestor_id, cmd->disable_hw_ack);
 
 	chan_info = &cmd->chan;
@@ -10044,13 +10044,13 @@ static QDF_STATUS send_mvr_ext_cmd(
 	WMI_SET_CHANNEL_REG_CLASSID(chan_info, tchan_info->reg_class_id);
 	WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, tchan_info->maxregpower);
 
-	WMI_LOGI("is_chan_passive:%d dfs_set:%d allow_vht:%d allow_ht:%d",
+	wmi_info("is_chan_passive:%d dfs_set:%d allow_vht:%d allow_ht:%d",
 		 tchan_info->is_chan_passive, tchan_info->dfs_set,
 		 tchan_info->allow_vht, tchan_info->allow_ht);
-	WMI_LOGI("antennamax:%d phy_mode:%d minpower:%d maxpower:%d",
+	wmi_info("antennamax:%d phy_mode:%d minpower:%d maxpower:%d",
 		 tchan_info->antennamax, tchan_info->phy_mode,
 		 tchan_info->minpower, tchan_info->maxpower);
-	WMI_LOGI("maxregpower:%d reg_class_id:%d",
+	wmi_info("maxregpower:%d reg_class_id:%d",
 		 tchan_info->maxregpower, tchan_info->reg_class_id);
 
 	/* To fill the Tag,Value pairs, move the buf accordingly */

wmi/src/wmi_unified_smart_ant_tlv.c

@@ -388,8 +388,8 @@ static QDF_STATUS send_smart_ant_set_training_info_cmd_tlv(
 		itr += 2;
 		train_param->train_antenna_series = param->antenna_array[loop];
 		train_param->rc_flags = 0;
-		WMI_LOGI(FL("Series number:%d\n"), loop);
-		WMI_LOGI(FL("Rate [0x%02x] Tx_Antenna [0x%08x]\n"),
+		wmi_info("Series number:%d", loop);
+		wmi_info("Rate [0x%02x] Tx_Antenna [0x%08x]",
 			 train_param->train_rate_series,
 			 train_param->train_antenna_series);
 		train_param++;
@@ -467,7 +467,7 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_tlv(
 
 	for (i = 0; i < param->args_count; i++) {
 		node_config_args[i] = param->args_arr[i];
-		WMI_LOGI("%d", param->args_arr[i]);
+		wmi_info("%d", param->args_arr[i]);
 	}
 
 	wmi_mtrace(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID,