diff --git a/wmi/src/wmi_filtered_logging.c b/wmi/src/wmi_filtered_logging.c index d0d45f4441..6b8bc4c798 100644 --- a/wmi/src/wmi_filtered_logging.c +++ b/wmi/src/wmi_filtered_logging.c @@ -410,7 +410,7 @@ ssize_t debug_filtered_wmi_cmds_write(struct file *file, } if (wmi_add_to_record_list(wmi_handle, k, WMI_CMD)) { - WMI_LOGE("Add cmd %d to WMI_CMD list failed", k); + wmi_err("Add cmd %d to WMI_CMD list failed", k); return 0; } @@ -447,7 +447,7 @@ ssize_t debug_filtered_wmi_evts_write(struct file *file, } if (wmi_add_to_record_list(wmi_handle, k, WMI_EVT)) { - WMI_LOGE("Add cmd %d to WMI_EVT list failed", k); + wmi_err("Add cmd %d to WMI_EVT list failed", k); return 0; } @@ -479,7 +479,7 @@ ssize_t debug_wmi_filtered_command_log_write(struct file *file, cmd_log_buf = wmi_handle->log_info.wmi_filtered_command_log; if (wmi_reset_filtered_buffers(wmi_handle, cmd_log_buf)) - WMI_LOGE("reset WMI CMD filtered_buffers failed"); + wmi_err("reset WMI CMD filtered_buffers failed"); return count; } @@ -508,6 +508,6 @@ ssize_t debug_wmi_filtered_event_log_write(struct file *file, cmd_log_buf = wmi_handle->log_info.wmi_filtered_event_log; if (wmi_reset_filtered_buffers(wmi_handle, cmd_log_buf)) - WMI_LOGE("reset WMI EVT filtered_buffers failed"); + wmi_err("reset WMI EVT filtered_buffers failed"); return count; } diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index 6d6c4a8305..a45c27c494 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -995,7 +995,7 @@ static int debug_wmi_log_size_show(struct seq_file *m, void *v) \ ret = sscanf(locbuf, "%d", &k); \ if ((ret != 1) || (k != 0)) { \ - WMI_LOGE("Wrong input, echo 0 to clear the wmi buffer");\ + wmi_err("Wrong input, echo 0 to clear the wmi buffer");\ return -EINVAL; \ } \ \ @@ -1165,7 +1165,7 @@ static void wmi_debugfs_create(wmi_unified_t wmi_handle, wmi_handle, wmi_debugfs_infos[i].ops); if (!wmi_handle->debugfs_de[i]) { - WMI_LOGE("debug Entry creation failed!"); + wmi_err("debug Entry creation failed!"); goto out; } } @@ -1173,7 +1173,7 @@ static void wmi_debugfs_create(wmi_unified_t wmi_handle, return; out: - WMI_LOGE("debug Entry creation failed!"); + wmi_err("debug Entry creation failed!"); wmi_log_buffer_free(wmi_handle); return; } @@ -1221,7 +1221,7 @@ static QDF_STATUS wmi_debugfs_init(wmi_unified_t wmi_handle, uint32_t pdev_idx) debugfs_create_dir(buf, NULL); if (!wmi_handle->log_info.wmi_log_debugfs_dir) { - WMI_LOGE("error while creating debugfs dir for %s", buf); + wmi_err("error while creating debugfs dir for %s", buf); return QDF_STATUS_E_FAILURE; } wmi_debugfs_create(wmi_handle, @@ -1498,7 +1498,7 @@ static QDF_STATUS wmi_ext_dbgfs_init(struct wmi_unified *wmi_handle, } if (!dentry) { - WMI_LOGE("error while creating extended wmi debugfs dir"); + wmi_err("error while creating extended wmi debugfs dir"); return QDF_STATUS_E_FAILURE; } @@ -1508,7 +1508,7 @@ static QDF_STATUS wmi_ext_dbgfs_init(struct wmi_unified *wmi_handle, if (!qdf_debugfs_create_file(WMI_EXT_DBG_FILE, WMI_EXT_DBG_FILE_PERM, dentry, &wmi_ext_dbgfs_ops[pdev_idx])) { qdf_debugfs_remove_dir(dentry); - WMI_LOGE("error while creating extended wmi debugfs file"); + wmi_err("Error while creating extended wmi debugfs file"); return QDF_STATUS_E_FAILURE; } @@ -1993,7 +1993,7 @@ wmi_register_event_handler_with_ctx(wmi_unified_t wmi_handle, struct wmi_soc *soc; if (!wmi_handle) { - WMI_LOGE("WMI handle is NULL"); + wmi_err("WMI handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -2013,7 +2013,7 @@ wmi_register_event_handler_with_ctx(wmi_unified_t wmi_handle, return QDF_STATUS_E_FAILURE; } if (soc->max_event_idx == WMI_UNIFIED_MAX_EVENT) { - WMI_LOGE("no more event handlers 0x%x", + wmi_err("no more event handlers 0x%x", evt_id); return QDF_STATUS_E_FAILURE; } @@ -2110,7 +2110,7 @@ QDF_STATUS wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, struct wmi_soc *soc; if (!wmi_handle) { - WMI_LOGE("WMI handle is NULL"); + wmi_err("WMI handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -2363,7 +2363,7 @@ static void wmi_process_control_rx(struct wmi_unified *wmi_handle, } else if (exec_ctx == WMI_RX_SERIALIZER_CTX) { wmi_process_fw_event_sched_thread_ctx(wmi_handle, evt_buf); } else { - WMI_LOGE("Invalid event context %d", exec_ctx); + wmi_err("Invalid event context %d", exec_ctx); qdf_nbuf_free(evt_buf); } @@ -2386,9 +2386,8 @@ static void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet) wmi_handle = wmi_get_pdev_ep(soc, htc_packet->Endpoint); if (!wmi_handle) { - WMI_LOGE - ("unable to get wmi_handle to Endpoint %d\n", - htc_packet->Endpoint); + wmi_err("unable to get wmi_handle to Endpoint %d", + htc_packet->Endpoint); qdf_nbuf_free(evt_buf); return; } @@ -2750,7 +2749,7 @@ void *wmi_unified_get_pdev_handle(struct wmi_soc *soc, uint32_t pdev_idx) wmi_handle->wmi_rx_work_queue = qdf_alloc_unbound_workqueue("wmi_rx_event_work_queue"); if (!wmi_handle->wmi_rx_work_queue) { - WMI_LOGE("failed to create wmi_rx_event_work_queue"); + wmi_err("failed to create wmi_rx_event_work_queue"); goto error; } wmi_handle->wmi_events = soc->wmi_events; @@ -2769,7 +2768,7 @@ void *wmi_unified_get_pdev_handle(struct wmi_soc *soc, uint32_t pdev_idx) wmi_interface_sequence_init(wmi_handle); if (wmi_ext_dbgfs_init(wmi_handle, pdev_idx) != QDF_STATUS_SUCCESS) - WMI_LOGE("failed to initialize wmi extended debugfs"); + wmi_err("Failed to initialize wmi extended debugfs"); soc->wmi_pdev[pdev_idx] = wmi_handle; } else @@ -2890,7 +2889,7 @@ void *wmi_unified_attach(void *scn_handle, wmi_handle->wmi_rx_work_queue = qdf_alloc_unbound_workqueue("wmi_rx_event_work_queue"); if (!wmi_handle->wmi_rx_work_queue) { - WMI_LOGE("failed to create wmi_rx_event_work_queue"); + wmi_err("failed to create wmi_rx_event_work_queue"); goto error; } wmi_interface_logging_init(wmi_handle, WMI_HOST_PDEV_ID_0); @@ -2903,7 +2902,7 @@ void *wmi_unified_attach(void *scn_handle, if (wmi_attach_register[param->target_type]) { wmi_attach_register[param->target_type](wmi_handle); } else { - WMI_LOGE("wmi attach is not registered"); + wmi_err("wmi attach is not registered"); goto error; } wmi_interface_sequence_init(wmi_handle); @@ -2919,7 +2918,7 @@ void *wmi_unified_attach(void *scn_handle, soc->ops = wmi_handle->ops; soc->wmi_pdev[0] = wmi_handle; if (wmi_ext_dbgfs_init(wmi_handle, 0) != QDF_STATUS_SUCCESS) - WMI_LOGE("failed to initialize wmi extended debugfs"); + wmi_err("Failed to initialize wmi extended debugfs"); wmi_wbuff_register(wmi_handle); @@ -3054,7 +3053,7 @@ static void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) ASSERT(wmi_cmd_buf); wmi_handle = wmi_get_pdev_ep(soc, htc_pkt->Endpoint); if (!wmi_handle) { - WMI_LOGE("%s: Unable to get wmi handle\n", __func__); + wmi_err("Unable to get wmi handle"); QDF_ASSERT(0); return; } @@ -3156,7 +3155,7 @@ static QDF_STATUS wmi_connect_pdev_htc_service(struct wmi_soc *soc, status = htc_connect_service(soc->htc_handle, &connect, &response); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to connect to WMI CONTROL service status:%d\n", + wmi_err("Failed to connect to WMI CONTROL service status:%d", status); return status; } diff --git a/wmi/src/wmi_unified_action_oui_tlv.c b/wmi/src/wmi_unified_action_oui_tlv.c index 57aa1b17f7..cca9b575d0 100644 --- a/wmi/src/wmi_unified_action_oui_tlv.c +++ b/wmi/src/wmi_unified_action_oui_tlv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018, 2020 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 @@ -17,6 +17,7 @@ */ #include "wmi_unified_action_oui_tlv.h" +#include "wmi_unified_priv.h" bool wmi_get_action_oui_id(enum action_oui_id action_id, wmi_vendor_oui_action_id *id) @@ -126,7 +127,7 @@ wmi_fill_oui_extensions_buffer(struct action_oui_extension *extension, for (i = 0; i < (uint8_t)no_oui_extns; i++) { if ((rem_var_buf_len - cmd_ext->buf_data_length) < 0) { - WMI_LOGE(FL("Invalid action oui command length")); + wmi_err("Invalid action oui command length"); return QDF_STATUS_E_INVAL; } @@ -197,7 +198,7 @@ send_action_oui_cmd_tlv(wmi_unified_t wmi_handle, QDF_STATUS status; if (!req) { - WMI_LOGE(FL("action oui is empty")); + wmi_err("action oui is empty"); return QDF_STATUS_E_INVAL; } @@ -211,13 +212,13 @@ send_action_oui_cmd_tlv(wmi_unified_t wmi_handle, no_oui_extns > WMI_MAX_VENDOR_OUI_ACTION_SUPPORTED_PER_ACTION || (total_no_oui_extns > WMI_VENDOR_OUI_ACTION_MAX_ACTION_ID * WMI_MAX_VENDOR_OUI_ACTION_SUPPORTED_PER_ACTION)) { - WMI_LOGE(FL("Invalid number of action oui extensions")); + wmi_err("Invalid number of action oui extensions"); return QDF_STATUS_E_INVAL; } valid = wmi_get_action_oui_id(req->action_id, &action_id); if (!valid) { - WMI_LOGE(FL("Invalid action id")); + wmi_err("Invalid action id"); return QDF_STATUS_E_INVAL; } @@ -242,7 +243,7 @@ send_action_oui_cmd_tlv(wmi_unified_t wmi_handle, wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE(FL("Failed to allocate wmi buffer")); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_FAILURE; } @@ -281,7 +282,7 @@ send_action_oui_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_PDEV_CONFIG_VENDOR_OUI_ACTION_CMDID)) { - WMI_LOGE(FL("WMI_PDEV_CONFIG_VENDOR_OUI_ACTION send fail")); + wmi_err("WMI_PDEV_CONFIG_VENDOR_OUI_ACTION send fail"); wmi_buf_free(wmi_buf); wmi_buf = NULL; return QDF_STATUS_E_FAILURE; diff --git a/wmi/src/wmi_unified_apf_tlv.c b/wmi/src/wmi_unified_apf_tlv.c index 9a049a0e2a..96acd38fc4 100644 --- a/wmi/src/wmi_unified_apf_tlv.c +++ b/wmi/src/wmi_unified_apf_tlv.c @@ -41,7 +41,7 @@ QDF_STATUS wmi_send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle, /* allocate command buffer */ buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -58,7 +58,7 @@ QDF_STATUS wmi_send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID:%d", + wmi_err("Failed to send WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID:%d", status); wmi_buf_free(buf); return status; @@ -90,8 +90,7 @@ QDF_STATUS wmi_send_apf_enable_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_BPF_SET_VDEV_ENABLE_CMDID)) { - WMI_LOGE("%s: Failed to enable/disable APF interpreter", - __func__); + wmi_err("Failed to enable/disable APF interpreter"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -148,7 +147,7 @@ wmi_send_apf_write_work_memory_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, wmi_buf_len, WMI_BPF_SET_VDEV_WORK_MEMORY_CMDID)) { - WMI_LOGE("%s: Failed to write APF work memory", __func__); + wmi_err("Failed to write APF work memory"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -183,7 +182,7 @@ wmi_send_apf_read_work_memory_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_BPF_GET_VDEV_WORK_MEMORY_CMDID)) { - WMI_LOGE("%s: Failed to get APF work memory", __func__); + wmi_err("Failed to get APF work memory"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -202,7 +201,7 @@ wmi_extract_apf_read_memory_resp_event_tlv(wmi_unified_t wmi_handle, param_buf = evt_buf; if (!param_buf) { - WMI_LOGE("encrypt decrypt resp evt_buf is NULL"); + wmi_err("encrypt decrypt resp evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -213,7 +212,7 @@ wmi_extract_apf_read_memory_resp_event_tlv(wmi_unified_t wmi_handle, resp->more_data = data_event->fragment; if (data_event->length > param_buf->num_data) { - WMI_LOGE("FW msg data_len %d more than TLV hdr %d", + wmi_err("FW msg data_len %d more than TLV hdr %d", data_event->length, param_buf->num_data); return QDF_STATUS_E_INVAL; diff --git a/wmi/src/wmi_unified_bcn_tlv.c b/wmi/src/wmi_unified_bcn_tlv.c index 714c9d236f..fee003f4c5 100644 --- a/wmi/src/wmi_unified_bcn_tlv.c +++ b/wmi/src/wmi_unified_bcn_tlv.c @@ -1,6 +1,5 @@ - /* - * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020 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 @@ -56,7 +55,7 @@ static QDF_STATUS send_bcn_buf_ll_cmd_tlv( WMI_PDEV_SEND_BCN_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_PDEV_SEND_BCN_CMDID command"); + wmi_err("Failed to send WMI_PDEV_SEND_BCN_CMDID command"); wmi_buf_free(wmi_buf); } diff --git a/wmi/src/wmi_unified_cfr_tlv.c b/wmi/src/wmi_unified_cfr_tlv.c index 6d0a0d91e1..be782021f3 100644 --- a/wmi/src/wmi_unified_cfr_tlv.c +++ b/wmi/src/wmi_unified_cfr_tlv.c @@ -32,13 +32,13 @@ extract_cfr_peer_tx_event_param_tlv(wmi_unified_t wmi_handle, void *evt_buf, param_buf = (WMI_PEER_CFR_CAPTURE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid cfr capture buffer"); + wmi_err("Invalid cfr capture buffer"); return QDF_STATUS_E_INVAL; } peer_tx_event_ev = param_buf->fixed_param; if (!peer_tx_event_ev) { - WMI_LOGE("peer cfr capture buffer is null"); + wmi_err("peer cfr capture buffer is null"); return QDF_STATUS_E_NULL_VALUE; } @@ -144,7 +144,7 @@ static QDF_STATUS send_cfr_rcc_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s:wmi_buf_alloc failed\n", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -245,7 +245,7 @@ static QDF_STATUS send_peer_cfr_capture_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PEER_CFR_CAPTURE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_PEER_CFR_CAPTURE_CMDID"); + wmi_err("Failed to send WMI_PEER_CFR_CAPTURE_CMDID"); wmi_buf_free(buf); } diff --git a/wmi/src/wmi_unified_concurrency_tlv.c b/wmi/src/wmi_unified_concurrency_tlv.c index f468b1bb44..530d651daf 100644 --- a/wmi/src/wmi_unified_concurrency_tlv.c +++ b/wmi/src/wmi_unified_concurrency_tlv.c @@ -102,9 +102,9 @@ static QDF_STATUS send_set_mcc_channel_time_latency_cmd_tlv( */ if ((latency_chan1 > 0) && (latency_chan1 < WMI_MCC_MIN_NON_ZERO_CHANNEL_LATENCY)) { - WMI_LOGE("%s: Invalid time latency for Channel #1 = %dms " + wmi_err("Invalid time latency for Channel #1 = %dms " "Minimum is 30ms (or 0 to use default value by " - "firmware)", __func__, latency_chan1); + "firmware)", latency_chan1); return QDF_STATUS_E_INVAL; } @@ -136,8 +136,7 @@ static QDF_STATUS send_set_mcc_channel_time_latency_cmd_tlv( ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_RESMGR_SET_CHAN_LATENCY_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send MCC Channel Time Latency command", - __func__); + wmi_err("Failed to send MCC Channel Time Latency command"); wmi_buf_free(buf); QDF_ASSERT(0); } @@ -184,8 +183,8 @@ static QDF_STATUS send_set_mcc_channel_time_quota_cmd_tlv( */ if (quota_chan1 < WMI_MCC_MIN_CHANNEL_QUOTA || quota_chan1 > WMI_MCC_MAX_CHANNEL_QUOTA) { - WMI_LOGE("%s: Invalid time quota for Channel #1=%dms. Minimum " - "is 20ms & maximum is 80ms", __func__, quota_chan1); + wmi_err("Invalid time quota for Channel #1=%dms. Minimum " + "is 20ms & maximum is 80ms", quota_chan1); return QDF_STATUS_E_INVAL; } /* Set WMI CMD for channel time quota here */ @@ -223,7 +222,7 @@ static QDF_STATUS send_set_mcc_channel_time_quota_cmd_tlv( ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send MCC Channel Time Quota command"); + wmi_err("Failed to send MCC Channel Time Quota command"); wmi_buf_free(buf); QDF_ASSERT(0); } diff --git a/wmi/src/wmi_unified_cp_stats_tlv.c b/wmi/src/wmi_unified_cp_stats_tlv.c index ee6c180083..1be18620a5 100644 --- a/wmi/src/wmi_unified_cp_stats_tlv.c +++ b/wmi/src/wmi_unified_cp_stats_tlv.c @@ -62,7 +62,7 @@ send_stats_request_cmd_tlv(wmi_unified_t wmi_handle, WMI_REQUEST_STATS_CMDID); if (ret) { - WMI_LOGE("Failed to send status request to fw =%d", ret); + wmi_err("Failed to send status request to fw =%d", ret); wmi_buf_free(buf); } @@ -92,12 +92,12 @@ extract_all_stats_counts_tlv(wmi_unified_t wmi_handle, void *evt_buf, ev = (wmi_stats_event_fixed_param *) param_buf->fixed_param; rssi_event = param_buf->chain_stats; if (!ev) { - WMI_LOGE("%s: event fixed param NULL", __func__); + wmi_err("event fixed param NULL"); return QDF_STATUS_E_FAILURE; } if (param_buf->num_data > WMI_SVC_MSG_MAX_SIZE - sizeof(*ev)) { - WMI_LOGE("num_data : %u is invalid", param_buf->num_data); + wmi_err("num_data : %u is invalid", param_buf->num_data); return QDF_STATUS_E_FAULT; } @@ -169,7 +169,7 @@ extract_all_stats_counts_tlv(wmi_unified_t wmi_handle, void *evt_buf, (((uint64_t)ev->num_mib_extd_stats) * sizeof(wmi_mib_extd_stats)); if (param_buf->num_data != min_data_len) { - WMI_LOGE("data len: %u isn't same as calculated: %llu", + wmi_err("data len: %u isn't same as calculated: %llu", param_buf->num_data, min_data_len); return QDF_STATUS_E_FAULT; } @@ -203,7 +203,7 @@ extract_all_stats_counts_tlv(wmi_unified_t wmi_handle, void *evt_buf, if (rssi_event->num_per_chain_rssi_stats >= WMITLV_GET_TLVLEN(rssi_event->tlv_header)) { - WMI_LOGE("num_per_chain_rssi_stats:%u is out of bounds", + wmi_err("num_per_chain_rssi_stats:%u is out of bounds", rssi_event->num_per_chain_rssi_stats); return QDF_STATUS_E_INVAL; } diff --git a/wmi/src/wmi_unified_dbr_tlv.c b/wmi/src/wmi_unified_dbr_tlv.c index a3c8ad98ab..85d3870c68 100644 --- a/wmi/src/wmi_unified_dbr_tlv.c +++ b/wmi/src/wmi_unified_dbr_tlv.c @@ -40,7 +40,7 @@ static QDF_STATUS send_dbr_cfg_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE(FL("wmi_buf_alloc failed")); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_FAILURE; } @@ -79,7 +79,7 @@ static QDF_STATUS send_dbr_cfg_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_DMA_RING_CFG_REQ_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL(":wmi cmd send failed")); + wmi_err(":wmi cmd send failed"); wmi_buf_free(buf); } @@ -153,7 +153,7 @@ static QDF_STATUS extract_dbr_buf_release_entry_tlv(wmi_unified_t wmi_handle, entry = ¶m_buf->entries[idx]; if (!entry) { - WMI_LOGE("%s: Entry is NULL", __func__); + wmi_err("Entry is NULL"); return QDF_STATUS_E_FAILURE; } @@ -179,7 +179,7 @@ static QDF_STATUS extract_dbr_buf_metadata_tlv( entry = ¶m_buf->meta_data[idx]; if (!entry) { - WMI_LOGE("%s: Entry is NULL", __func__); + wmi_err("Entry is NULL"); return QDF_STATUS_E_FAILURE; } diff --git a/wmi/src/wmi_unified_dcs_tlv.c b/wmi/src/wmi_unified_dcs_tlv.c index ef9a9c6ac8..e7149bd4b0 100644 --- a/wmi/src/wmi_unified_dcs_tlv.c +++ b/wmi/src/wmi_unified_dcs_tlv.c @@ -35,12 +35,12 @@ static QDF_STATUS extract_dcs_interference_type_tlv( param_buf = (WMI_DCS_INTERFERENCE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid dcs interference event buffer"); + wmi_err("Invalid dcs interference event buffer"); return QDF_STATUS_E_INVAL; } if (!param_buf->fixed_param) { - WMI_LOGE("Invalid fixed param"); + wmi_err("Invalid fixed param"); return QDF_STATUS_E_INVAL; } @@ -71,13 +71,13 @@ static QDF_STATUS extract_dcs_im_tgt_stats_tlv( param_buf = (WMI_DCS_INTERFERENCE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid dcs interference event buffer"); + wmi_err("Invalid dcs interference event buffer"); return QDF_STATUS_E_INVAL; } ev = param_buf->wlan_stat; if (!ev) { - WMI_LOGE("Invalid wlan stat"); + wmi_err("Invalid wlan stat"); return QDF_STATUS_E_INVAL; } diff --git a/wmi/src/wmi_unified_extscan_tlv.c b/wmi/src/wmi_unified_extscan_tlv.c index 799074c9d7..c2e880d555 100644 --- a/wmi/src/wmi_unified_extscan_tlv.c +++ b/wmi/src/wmi_unified_extscan_tlv.c @@ -42,7 +42,7 @@ static QDF_STATUS send_reset_passpoint_network_list_cmd_tlv len = sizeof(*cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed allocate wmi buffer", __func__); + wmi_err("Failed allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -57,8 +57,7 @@ static QDF_STATUS send_reset_passpoint_network_list_cmd_tlv ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PASSPOINT_LIST_CONFIG_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send reset passpoint network list wmi cmd", - __func__); + wmi_err("Failed to send reset passpoint network list wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -90,7 +89,7 @@ static QDF_STATUS send_set_passpoint_network_list_cmd_tlv for (i = 0; i < req->num_networks; i++) { buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed allocate wmi buffer", __func__); + wmi_err("Failed allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -124,8 +123,7 @@ static QDF_STATUS send_set_passpoint_network_list_cmd_tlv ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PASSPOINT_LIST_CONFIG_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send set passpoint network list wmi cmd", - __func__); + wmi_err("Failed to send set passpoint network list wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -173,7 +171,7 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed allocate wmi buffer", __func__); + wmi_err("Failed allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -270,7 +268,7 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send nlo wmi cmd", __func__); + wmi_err("Failed to send nlo wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_INVAL; } @@ -301,7 +299,7 @@ static QDF_STATUS send_extscan_get_capabilities_cmd_tlv(wmi_unified_t wmi_handle len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -316,7 +314,7 @@ static QDF_STATUS send_extscan_get_capabilities_cmd_tlv(wmi_unified_t wmi_handle if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_EXTSCAN_GET_CAPABILITIES_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("Failed to send extscan get capabilities cmd"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -343,7 +341,7 @@ static QDF_STATUS send_extscan_get_cached_results_cmd_tlv(wmi_unified_t wmi_hand len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -360,7 +358,7 @@ static QDF_STATUS send_extscan_get_cached_results_cmd_tlv(wmi_unified_t wmi_hand if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("failed to command", __func__); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -393,7 +391,7 @@ static QDF_STATUS send_extscan_stop_change_monitor_cmd_tlv len += change_list * sizeof(wmi_extscan_wlan_change_bssid_param); wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -420,7 +418,7 @@ static QDF_STATUS send_extscan_stop_change_monitor_cmd_tlv if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("Failed to send extscan change monitor cmd"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -452,7 +450,7 @@ static QDF_STATUS wmi_get_buf_extscan_change_monitor_cmd struct ap_threshold_params *src_ap = psigchange->ap; if (!numap || (numap > WMI_WLAN_EXTSCAN_MAX_SIGNIFICANT_CHANGE_APS)) { - WMI_LOGE("%s: Invalid number of bssid's", __func__); + wmi_err("Invalid number of bssid's"); return QDF_STATUS_E_INVAL; } len += WMI_TLV_HDR_SIZE; @@ -534,17 +532,16 @@ static QDF_STATUS send_extscan_start_change_monitor_cmd_tlv psigchange, &buf, &len); if (qdf_status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Failed to get buffer for change monitor cmd", - __func__); + wmi_err("Failed to get buffer for change monitor cmd"); return QDF_STATUS_E_FAILURE; } if (!buf) { - WMI_LOGE("%s: Failed to get buffer", __func__); + wmi_err("Failed to get buffer"); return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { - WMI_LOGE("%s: failed to send command", __func__); + wmi_err("Failed to send command"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -578,7 +575,7 @@ static QDF_STATUS send_extscan_stop_hotlist_monitor_cmd_tlv wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -603,7 +600,7 @@ static QDF_STATUS send_extscan_stop_hotlist_monitor_cmd_tlv if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("Failed to send extscan cfg hotlist cmd"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -630,7 +627,7 @@ static QDF_STATUS send_stop_extscan_cmd_tlv(wmi_unified_t wmi_handle, len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wmi_handle, len); if (!wmi_buf) { - WMI_LOGE("%s: wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -645,7 +642,7 @@ static QDF_STATUS send_stop_extscan_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_EXTSCAN_STOP_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("Failed to send extscan stop cmd"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -915,17 +912,16 @@ static QDF_STATUS send_start_extscan_cmd_tlv(wmi_unified_t wmi_handle, qdf_status = wmi_get_buf_extscan_start_cmd(wmi_handle, pstart, &buf, &len); if (qdf_status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Failed to get buffer for ext scan cmd", __func__); + wmi_err("Failed to get buffer for ext scan cmd"); return QDF_STATUS_E_FAILURE; } if (!buf) { - WMI_LOGE("%s:Failed to get buffer for current extscan info", - __func__); + wmi_err("Failed to get buffer for current extscan info"); return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTSCAN_START_CMDID)) { - WMI_LOGE("%s: failed to send command", __func__); + wmi_err("Failed to send extscan start cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -996,7 +992,7 @@ static QDF_STATUS send_extscan_start_hotlist_monitor_cmd_tlv * to be non zero value */ if (!numap || (numap > WMI_WLAN_EXTSCAN_MAX_HOTLIST_APS)) { - WMI_LOGE("Invalid number of APs: %d", numap); + wmi_err("Invalid number of APs: %d", numap); return QDF_STATUS_E_INVAL; } @@ -1070,7 +1066,7 @@ static QDF_STATUS send_extscan_start_hotlist_monitor_cmd_tlv if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { - WMI_LOGE("%s: failed to send command", __func__); + wmi_err("Failed to send extscan cfg hotlist monitor cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } diff --git a/wmi/src/wmi_unified_fwol_tlv.c b/wmi/src/wmi_unified_fwol_tlv.c index c9b20f86d0..a529f59675 100644 --- a/wmi/src/wmi_unified_fwol_tlv.c +++ b/wmi/src/wmi_unified_fwol_tlv.c @@ -43,7 +43,7 @@ send_set_elna_bypass_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed to allocate wmi buffer", __func__); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -58,7 +58,7 @@ send_set_elna_bypass_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SET_ELNA_BYPASS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set param command ret = %d", ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } @@ -85,7 +85,7 @@ send_get_elna_bypass_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed to allocate wmi buffer", __func__); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -99,7 +99,7 @@ send_get_elna_bypass_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_GET_ELNA_BYPASS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set param command ret = %d", ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } @@ -126,7 +126,7 @@ extract_get_elna_bypass_resp_tlv(struct wmi_unified *wmi_handle, void *resp_buf, param_buf = resp_buf; evt = param_buf->fixed_param; if (!evt) { - WMI_LOGE("Invalid get elna bypass event"); + wmi_err("Invalid get elna bypass event"); return QDF_STATUS_E_INVAL; } @@ -173,7 +173,7 @@ send_dscp_tid_map_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed to allocate wmi buffer", __func__); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -190,7 +190,7 @@ send_dscp_tid_map_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_DSCP_TID_MAP_CMDID); if (status) { - WMI_LOGE("Failed to send dscp_up_map_to_fw %d", status); + wmi_err("Failed to send dscp_up_map_to_fw %d", status); wmi_buf_free(buf); } diff --git a/wmi/src/wmi_unified_nan_tlv.c b/wmi/src/wmi_unified_nan_tlv.c index 9c6f9bc3d1..472337249a 100644 --- a/wmi/src/wmi_unified_nan_tlv.c +++ b/wmi/src/wmi_unified_nan_tlv.c @@ -58,8 +58,8 @@ extract_nan_event_rsp_tlv(wmi_unified_t wmi_handle, void *evt_buf, /* Actual data may include some padding, so data_len <= num_data */ if (nan_rsp_event_hdr->data_len > event->num_data) { - WMI_LOGE("%s: Provided NAN event length(%d) exceeding actual length(%d)!", - __func__, nan_rsp_event_hdr->data_len, + wmi_err("Provided NAN event length(%d) exceeding actual length(%d)!", + nan_rsp_event_hdr->data_len, event->num_data); return QDF_STATUS_E_INVAL; } @@ -69,7 +69,7 @@ extract_nan_event_rsp_tlv(wmi_unified_t wmi_handle, void *evt_buf, if (nan_rsp_event_hdr->data_len < sizeof(nan_msg_header_t) || nan_rsp_event_hdr->data_len > (WMI_SVC_MSG_MAX_SIZE - WMI_TLV_HDR_SIZE)) { - WMI_LOGE("%s: Invalid NAN event data length(%d)!", __func__, + wmi_err("Invalid NAN event data length(%d)!", nan_rsp_event_hdr->data_len); return QDF_STATUS_E_INVAL; } @@ -85,7 +85,7 @@ extract_nan_event_rsp_tlv(wmi_unified_t wmi_handle, void *evt_buf, case NAN_MSG_ID_ENABLE_RSP: nan_evt_info = event->event_info; if (!nan_evt_info) { - WMI_LOGE(FL("Fail: NAN enable rsp event info Null")); + wmi_err("Fail: NAN enable rsp event info Null"); return QDF_STATUS_E_INVAL; } evt_params->evt_type = nan_event_id_enable_rsp; @@ -153,7 +153,7 @@ static QDF_STATUS send_nan_disable_req_cmd_tlv(wmi_unified_t wmi_handle, */ if (!nan_msg) { - WMI_LOGE("%s:nan req is not valid", __func__); + wmi_err("nan req is not valid"); return QDF_STATUS_E_FAILURE; } @@ -162,15 +162,13 @@ static QDF_STATUS send_nan_disable_req_cmd_tlv(wmi_unified_t wmi_handle, if (nan_data_len) { nan_data_len_aligned = roundup(nan_data_len, sizeof(uint32_t)); if (nan_data_len_aligned < nan_data_len) { - WMI_LOGE("%s: Int overflow while rounding up data_len", - __func__); + wmi_err("Int overflow while rounding up data_len"); return QDF_STATUS_E_FAILURE; } if (nan_data_len_aligned > WMI_SVC_MSG_MAX_SIZE - WMI_TLV_HDR_SIZE) { - WMI_LOGE("%s: nan_data_len exceeding wmi_max_msg_size", - __func__); + wmi_err("nan_data_len exceeding wmi_max_msg_size"); return QDF_STATUS_E_FAILURE; } @@ -215,8 +213,7 @@ static QDF_STATUS send_nan_disable_req_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NAN_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s Failed to send set param command ret = %d", - __func__, ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } @@ -253,21 +250,19 @@ static QDF_STATUS send_nan_req_cmd_tlv(wmi_unified_t wmi_handle, * +-----------------------+------------------------------------+ */ if (!nan_msg) { - WMI_LOGE("%s:nan req is not valid", __func__); + wmi_err("nan req is not valid"); return QDF_STATUS_E_FAILURE; } nan_data_len = nan_msg->request_data_len; nan_data_len_aligned = roundup(nan_msg->request_data_len, sizeof(uint32_t)); if (nan_data_len_aligned < nan_msg->request_data_len) { - WMI_LOGE("%s: integer overflow while rounding up data_len", - __func__); + wmi_err("integer overflow while rounding up data_len"); return QDF_STATUS_E_FAILURE; } if (nan_data_len_aligned > WMI_SVC_MSG_MAX_SIZE - WMI_TLV_HDR_SIZE) { - WMI_LOGE("%s: wmi_max_msg_size overflow for given datalen", - __func__); + wmi_err("wmi_max_msg_size overflow for given datalen"); return QDF_STATUS_E_FAILURE; } @@ -305,8 +300,7 @@ static QDF_STATUS send_nan_req_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_NAN_CMDID, NO_SESSION, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NAN_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s Failed to send NAN req command ret = %d", - __func__, ret); + wmi_err("Failed to send NAN req command ret = %d", ret); wmi_buf_free(buf); } @@ -347,7 +341,7 @@ static QDF_STATUS send_terminate_all_ndps_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_NDP_CMDID, NO_SESSION, 0); status = wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_NDP_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send NDP Terminate cmd: %d", status); + wmi_err("Failed to send NDP Terminate cmd: %d", status); wmi_buf_free(wmi_buf); } @@ -468,7 +462,7 @@ static QDF_STATUS nan_ndp_initiator_req_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NDP_INITIATOR_REQ_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_NDP_INITIATOR_REQ_CMDID failed, ret: %d", status); + wmi_err("WMI_NDP_INITIATOR_REQ_CMDID failed, ret: %d", status); wmi_buf_free(buf); } @@ -590,7 +584,7 @@ static QDF_STATUS nan_ndp_responder_req_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NDP_RESPONDER_REQ_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_NDP_RESPONDER_REQ_CMDID failed, ret: %d", status); + wmi_err("WMI_NDP_RESPONDER_REQ_CMDID failed, ret: %d", status); wmi_buf_free(buf); } return status; @@ -640,7 +634,7 @@ static QDF_STATUS nan_ndp_end_req_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NDP_END_REQ_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_NDP_END_REQ_CMDID failed, ret: %d", status); + wmi_err("WMI_NDP_END_REQ_CMDID failed, ret: %d", status); wmi_buf_free(buf); } @@ -662,7 +656,7 @@ extract_ndp_host_event_tlv(wmi_unified_t wmi_handle, uint8_t *data, fixed_params->vdev_id, WLAN_NAN_ID); if (!evt->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } @@ -686,7 +680,7 @@ static QDF_STATUS extract_ndp_initiator_rsp_tlv(wmi_unified_t wmi_handle, fixed_params->vdev_id, WLAN_NAN_ID); if (!rsp->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } @@ -733,20 +727,20 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, (wmi_ndp_indication_event_fixed_param *)event->fixed_param; if (fixed_params->ndp_cfg_len > event->num_ndp_cfg) { - WMI_LOGE("FW message ndp cfg length %d larger than TLV hdr %d", + wmi_err("FW message ndp cfg length %d larger than TLV hdr %d", fixed_params->ndp_cfg_len, event->num_ndp_cfg); return QDF_STATUS_E_INVAL; } if (fixed_params->ndp_app_info_len > event->num_ndp_app_info) { - WMI_LOGE("FW message ndp app info length %d more than TLV hdr %d", + wmi_err("FW message ndp app info length %d more than TLV hdr %d", fixed_params->ndp_app_info_len, event->num_ndp_app_info); return QDF_STATUS_E_INVAL; } if (fixed_params->nan_scid_len > event->num_ndp_scid) { - WMI_LOGE("FW msg ndp scid info len %d more than TLV hdr %d", + wmi_err("FW msg ndp scid info len %d more than TLV hdr %d", fixed_params->nan_scid_len, event->num_ndp_scid); return QDF_STATUS_E_INVAL; @@ -754,8 +748,8 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, if (fixed_params->ndp_cfg_len > (WMI_SVC_MSG_MAX_SIZE - sizeof(*fixed_params))) { - WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d", - __func__, fixed_params->ndp_cfg_len); + wmi_err("excess wmi buffer: ndp_cfg_len %d", + fixed_params->ndp_cfg_len); return QDF_STATUS_E_INVAL; } @@ -764,16 +758,16 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, if (fixed_params->ndp_app_info_len > (WMI_SVC_MSG_MAX_SIZE - total_array_len)) { - WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d", - __func__, fixed_params->ndp_app_info_len); + wmi_err("excess wmi buffer: ndp_cfg_len %d", + fixed_params->ndp_app_info_len); return QDF_STATUS_E_INVAL; } total_array_len += fixed_params->ndp_app_info_len; if (fixed_params->nan_scid_len > (WMI_SVC_MSG_MAX_SIZE - total_array_len)) { - WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d", - __func__, fixed_params->nan_scid_len); + wmi_err("excess wmi buffer: ndp_cfg_len %d", + fixed_params->nan_scid_len); return QDF_STATUS_E_INVAL; } @@ -782,7 +776,7 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, fixed_params->vdev_id, WLAN_NAN_ID); if (!rsp->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } rsp->service_instance_id = fixed_params->service_instance_id; @@ -867,13 +861,13 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, fixed_params->num_ndp_channels); if (fixed_params->ndp_cfg_len > event->num_ndp_cfg) { - WMI_LOGE("FW message ndp cfg length %d larger than TLV hdr %d", + wmi_err("FW message ndp cfg length %d larger than TLV hdr %d", fixed_params->ndp_cfg_len, event->num_ndp_cfg); return QDF_STATUS_E_INVAL; } if (fixed_params->ndp_app_info_len > event->num_ndp_app_info) { - WMI_LOGE("FW message ndp app info length %d more than TLV hdr %d", + wmi_err("FW message ndp app info length %d more than TLV hdr %d", fixed_params->ndp_app_info_len, event->num_ndp_app_info); return QDF_STATUS_E_INVAL; @@ -884,8 +878,8 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, if (fixed_params->ndp_cfg_len > (WMI_SVC_MSG_MAX_SIZE - sizeof(*fixed_params))) { - WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d", - __func__, fixed_params->ndp_cfg_len); + wmi_err("excess wmi buffer: ndp_cfg_len %d", + fixed_params->ndp_cfg_len); return QDF_STATUS_E_INVAL; } @@ -894,14 +888,14 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, if (fixed_params->ndp_app_info_len > (WMI_SVC_MSG_MAX_SIZE - total_array_len)) { - WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d", - __func__, fixed_params->ndp_app_info_len); + wmi_err("excess wmi buffer: ndp_cfg_len %d", + fixed_params->ndp_app_info_len); return QDF_STATUS_E_INVAL; } if (fixed_params->num_ndp_channels > event->num_ndp_channel_list || fixed_params->num_ndp_channels > event->num_nss_list) { - WMI_LOGE(FL("NDP Ch count %d greater than NDP Ch TLV len(%d) or NSS TLV len(%d)"), + wmi_err("NDP Ch count %d greater than NDP Ch TLV len(%d) or NSS TLV len(%d)", fixed_params->num_ndp_channels, event->num_ndp_channel_list, event->num_nss_list); @@ -910,7 +904,7 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, if (ndi_dbs && fixed_params->num_ndp_channels > event->num_ndp_channel_info) { - WMI_LOGE(FL("NDP Ch count %d greater than NDP Ch info(%d)"), + wmi_err("NDP Ch count %d greater than NDP Ch info(%d)", fixed_params->num_ndp_channels, event->num_ndp_channel_info); return QDF_STATUS_E_INVAL; @@ -921,7 +915,7 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, fixed_params->vdev_id, WLAN_NAN_ID); if (!rsp->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } rsp->ndp_instance_id = fixed_params->ndp_instance_id; @@ -936,7 +930,7 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, rsp->ndp_info.ndp_app_info_len); if (rsp->num_channels > NAN_CH_INFO_MAX_CHANNELS) { - WMI_LOGE(FL("too many channels")); + wmi_err("too many channels"); rsp->num_channels = NAN_CH_INFO_MAX_CHANNELS; } @@ -1000,7 +994,7 @@ static QDF_STATUS extract_ndp_responder_rsp_tlv(wmi_unified_t wmi_handle, fixed_params->vdev_id, WLAN_NAN_ID); if (!rsp->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } rsp->transaction_id = fixed_params->transaction_id; @@ -1033,7 +1027,7 @@ static QDF_STATUS extract_ndp_end_rsp_tlv(wmi_unified_t wmi_handle, rsp->vdev = wlan_objmgr_get_vdev_by_opmode_from_psoc( wmi_handle->soc->wmi_psoc, QDF_NDI_MODE, WLAN_NAN_ID); if (!rsp->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } rsp->transaction_id = fixed_params->transaction_id; @@ -1055,7 +1049,7 @@ static QDF_STATUS extract_ndp_end_ind_tlv(wmi_unified_t wmi_handle, ind = event->ndp_end_indication_list; if (event->num_ndp_end_indication_list == 0) { - WMI_LOGE("Error: Event ignored, 0 ndp instances"); + wmi_err("Error: Event ignored, 0 ndp instances"); return QDF_STATUS_E_INVAL; } @@ -1064,7 +1058,7 @@ static QDF_STATUS extract_ndp_end_ind_tlv(wmi_unified_t wmi_handle, if (event->num_ndp_end_indication_list > ((UINT_MAX - sizeof(**rsp))/ sizeof((*rsp)->ndp_map[0]))) { - WMI_LOGE("num_ndp_end_ind_list %d too large", + wmi_err("num_ndp_end_ind_list %d too large", event->num_ndp_end_indication_list); return QDF_STATUS_E_INVAL; } @@ -1116,7 +1110,7 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, if (fixed_params->num_channels > event->num_ndl_channel_list || fixed_params->num_channels > event->num_nss_list) { - WMI_LOGE(FL("Channel count %d greater than NDP Ch list TLV len(%d) or NSS list TLV len(%d)"), + wmi_err("Channel count %d greater than NDP Ch list TLV len(%d) or NSS list TLV len(%d)", fixed_params->num_channels, event->num_ndl_channel_list, event->num_nss_list); @@ -1125,14 +1119,14 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, if (ndi_dbs && fixed_params->num_channels > event->num_ndp_channel_info) { - WMI_LOGE(FL("Channel count %d greater than NDP Ch info(%d)"), + wmi_err("Channel count %d greater than NDP Ch info(%d)", fixed_params->num_channels, event->num_ndp_channel_info); return QDF_STATUS_E_INVAL; } if (fixed_params->num_ndp_instances > event->num_ndp_instance_list) { - WMI_LOGE(FL("NDP Instance count %d greater than NDP Instancei TLV len %d"), + wmi_err("NDP Instance count %d greater than NDP Instancei TLV len %d", fixed_params->num_ndp_instances, event->num_ndp_instance_list); return QDF_STATUS_E_INVAL; @@ -1143,7 +1137,7 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, fixed_params->vdev_id, WLAN_NAN_ID); if (!ind->vdev) { - WMI_LOGE("vdev is null"); + wmi_err("vdev is null"); return QDF_STATUS_E_INVAL; } @@ -1154,7 +1148,7 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, ind->peer_addr.bytes); if (ind->num_ndp_instances > NDP_NUM_INSTANCE_ID) { - WMI_LOGE(FL("uint32 overflow")); + wmi_err("uint32 overflow"); wlan_objmgr_vdev_release_ref(ind->vdev, WLAN_NAN_ID); return QDF_STATUS_E_INVAL; } @@ -1163,7 +1157,7 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, sizeof(uint32_t) * ind->num_ndp_instances); if (ind->num_channels > NAN_CH_INFO_MAX_CHANNELS) { - WMI_LOGE(FL("too many channels")); + wmi_err("too many channels"); ind->num_channels = NAN_CH_INFO_MAX_CHANNELS; } diff --git a/wmi/src/wmi_unified_ocb_tlv.c b/wmi/src/wmi_unified_ocb_tlv.c index b02c429c60..211c0a6148 100644 --- a/wmi/src/wmi_unified_ocb_tlv.c +++ b/wmi/src/wmi_unified_ocb_tlv.c @@ -61,7 +61,7 @@ static QDF_STATUS send_ocb_set_utc_time_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OCB_SET_UTC_TIME_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to set OCB UTC time")); + wmi_err("Failed to set OCB UTC time"); wmi_buf_free(buf); } @@ -124,7 +124,7 @@ static QDF_STATUS send_ocb_start_timing_advert_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OCB_START_TIMING_ADVERT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to start OCB timing advert")); + wmi_err("Failed to start OCB timing advert"); wmi_buf_free(buf); } @@ -167,7 +167,7 @@ static QDF_STATUS send_ocb_stop_timing_advert_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OCB_STOP_TIMING_ADVERT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to stop OCB timing advert")); + wmi_err("Failed to stop OCB timing advert"); wmi_buf_free(buf); } @@ -211,7 +211,7 @@ static QDF_STATUS send_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle, WMI_OCB_GET_TSF_TIMER_CMDID); /* If there is an error, set the completion event */ if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to send WMI message: %d"), ret); + wmi_err("Failed to send WMI message: %d", ret); wmi_buf_free(buf); } @@ -239,7 +239,7 @@ static QDF_STATUS send_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle, /* Validate the input */ if (get_stats_param->request_array_len != get_stats_param->channel_count * sizeof(*channel_stats_array)) { - WMI_LOGE(FL("Invalid parameter")); + wmi_err("Invalid parameter"); return QDF_STATUS_E_INVAL; } @@ -285,7 +285,7 @@ static QDF_STATUS send_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle, WMI_DCC_GET_STATS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to send WMI message: %d"), ret); + wmi_err("Failed to send WMI message: %d", ret); wmi_buf_free(buf); } @@ -335,7 +335,7 @@ static QDF_STATUS send_dcc_clear_stats_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_DCC_CLEAR_STATS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to send the WMI command")); + wmi_err("Failed to send the WMI command"); wmi_buf_free(buf); } @@ -365,7 +365,7 @@ static QDF_STATUS send_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle, /* validate the input */ if (update_ndl_param->dcc_ndl_chan_list_len != update_ndl_param->channel_count * sizeof(*ndl_chan_array)) { - WMI_LOGE(FL("Invalid parameter")); + wmi_err("Invalid parameter"); return QDF_STATUS_E_INVAL; } active_state_count = 0; @@ -375,7 +375,7 @@ static QDF_STATUS send_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle, WMI_NDL_NUM_ACTIVE_STATE_GET(&ndl_chan_array[i]); if (update_ndl_param->dcc_ndl_active_state_list_len != active_state_count * sizeof(*ndl_active_state_array)) { - WMI_LOGE(FL("Invalid parameter")); + wmi_err("Invalid parameter"); return QDF_STATUS_E_INVAL; } @@ -440,7 +440,7 @@ static QDF_STATUS send_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle, WMI_DCC_UPDATE_NDL_CMDID); /* If there is an error, set the completion event */ if (QDF_IS_STATUS_ERROR(qdf_status)) { - WMI_LOGE(FL("Failed to send WMI message: %d"), qdf_status); + wmi_err("Failed to send WMI message: %d", qdf_status); wmi_buf_free(buf); } @@ -479,7 +479,7 @@ static QDF_STATUS send_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle, if (!config->dcc_ndl_chan_list || config->dcc_ndl_chan_list_len != config->channel_count * sizeof(wmi_dcc_ndl_chan)) { - WMI_LOGE(FL("NDL channel is invalid. List len: %d"), + wmi_err("NDL channel is invalid. List len: %d", config->dcc_ndl_chan_list_len); return QDF_STATUS_E_INVAL; } @@ -494,7 +494,7 @@ static QDF_STATUS send_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle, config->dcc_ndl_active_state_list_len != active_state_count * sizeof(wmi_dcc_ndl_active_state_config)) { - WMI_LOGE(FL("NDL active state is invalid.")); + wmi_err("NDL active state is invalid"); return QDF_STATUS_E_INVAL; } } @@ -646,7 +646,7 @@ static QDF_STATUS send_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OCB_SET_CONFIG_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to set OCB config"); + wmi_err("Failed to set OCB config"); wmi_buf_free(buf); } diff --git a/wmi/src/wmi_unified_p2p_api.c b/wmi/src/wmi_unified_p2p_api.c index d5ddb9b3a8..62c5ea4134 100644 --- a/wmi/src/wmi_unified_p2p_api.c +++ b/wmi/src/wmi_unified_p2p_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 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 @@ -47,7 +47,7 @@ QDF_STATUS wmi_extract_p2p_noa_ev_param(wmi_unified_t wmi_handle, struct p2p_noa_info *param) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } @@ -63,7 +63,7 @@ wmi_send_set_mac_addr_rx_filter_cmd(wmi_unified_t wmi_handle, struct p2p_set_mac_filter *param) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } @@ -80,7 +80,7 @@ wmi_extract_mac_addr_rx_filter_evt_param(wmi_unified_t wmi_handle, struct p2p_set_mac_filter_evt *param) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } @@ -96,7 +96,7 @@ QDF_STATUS wmi_unified_p2p_lo_start_cmd(wmi_unified_t wmi_handle, struct p2p_lo_start *param) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } @@ -111,7 +111,7 @@ QDF_STATUS wmi_unified_p2p_lo_stop_cmd(wmi_unified_t wmi_handle, uint8_t vdev_id) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } @@ -127,7 +127,7 @@ QDF_STATUS wmi_extract_p2p_lo_stop_ev_param(wmi_unified_t wmi_handle, struct p2p_lo_event *param) { if (!wmi_handle) { - WMI_LOGE("wmi handle is null"); + wmi_err("wmi handle is null"); return QDF_STATUS_E_INVAL; } diff --git a/wmi/src/wmi_unified_p2p_tlv.c b/wmi/src/wmi_unified_p2p_tlv.c index f7f31eea8d..d98c6362da 100644 --- a/wmi/src/wmi_unified_p2p_tlv.c +++ b/wmi/src/wmi_unified_p2p_tlv.c @@ -79,7 +79,7 @@ static QDF_STATUS send_set_p2pgo_noa_req_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID"); + wmi_err("Failed to send WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID"); wmi_buf_free(buf); } @@ -125,7 +125,7 @@ static QDF_STATUS send_set_p2pgo_oppps_req_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_P2P_SET_OPPPS_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_P2P_SET_OPPPS_PARAM_CMDID"); + wmi_err("Failed to send WMI_P2P_SET_OPPPS_PARAM_CMDID"); wmi_buf_free(buf); } @@ -155,12 +155,12 @@ static QDF_STATUS extract_p2p_noa_ev_param_tlv( param_tlvs = (WMI_P2P_NOA_EVENTID_param_tlvs *)evt_buf; if (!param_tlvs) { - WMI_LOGE("%s: Invalid P2P NoA event buffer", __func__); + wmi_err("Invalid P2P NoA event buffer"); return QDF_STATUS_E_INVAL; } if (!param) { - WMI_LOGE("noa information param is null"); + wmi_err("noa information param is null"); return QDF_STATUS_E_INVAL; } @@ -170,7 +170,7 @@ static QDF_STATUS extract_p2p_noa_ev_param_tlv( wmi_noa_info = (wmi_p2p_noa_info *) (buf_ptr); if (!WMI_UNIFIED_NOA_ATTR_IS_MODIFIED(wmi_noa_info)) { - WMI_LOGE("%s: noa attr is not modified", __func__); + wmi_err("noa attr is not modified"); return QDF_STATUS_E_INVAL; } @@ -184,8 +184,7 @@ static QDF_STATUS extract_p2p_noa_ev_param_tlv( descriptors = WMI_UNIFIED_NOA_ATTR_NUM_DESC_GET(wmi_noa_info); param->num_desc = (uint8_t)descriptors; if (param->num_desc > WMI_P2P_MAX_NOA_DESCRIPTORS) { - WMI_LOGE("%s: invalid num desc:%d", __func__, - param->num_desc); + wmi_err("Invalid num desc: %d", param->num_desc); return QDF_STATUS_E_INVAL; } @@ -223,14 +222,14 @@ send_set_mac_addr_rx_filter_cmd_tlv(wmi_unified_t wmi_handle, int ret; if (!wmi_handle) { - WMI_LOGE("WMA context is invald!"); + wmi_err("WMA context is invald!"); return QDF_STATUS_E_INVAL; } len = sizeof(*cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("Failed allocate wmi buffer"); + wmi_err("Failed allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -256,7 +255,7 @@ send_set_mac_addr_rx_filter_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID); if (ret) { - WMI_LOGE("Failed to send action frame random mac cmd"); + wmi_err("Failed to send action frame random mac cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -275,12 +274,12 @@ static QDF_STATUS extract_mac_addr_rx_filter_evt_param_tlv( (WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - WMI_LOGE("Invalid action frame filter mac event"); + wmi_err("Invalid action frame filter mac event"); return QDF_STATUS_E_INVAL; } event = param_buf->fixed_param; if (!event) { - WMI_LOGE("Invalid fixed param"); + wmi_err("Invalid fixed param"); return QDF_STATUS_E_INVAL; } param->vdev_id = event->vdev_id; @@ -309,7 +308,7 @@ static QDF_STATUS send_p2p_lo_start_cmd_tlv(wmi_unified_t wmi_handle, int probe_resp_len_aligned; if (!param) { - WMI_LOGE("lo start param is null"); + wmi_err("lo start param is null"); return QDF_STATUS_E_INVAL; } @@ -368,8 +367,7 @@ static QDF_STATUS send_p2p_lo_start_cmd_tlv(wmi_unified_t wmi_handle, buf, len, WMI_P2P_LISTEN_OFFLOAD_START_CMDID); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Failed to send p2p lo start: %d", - __func__, status); + wmi_err("Failed to send p2p lo start: %d", status); wmi_buf_free(buf); return status; } @@ -416,8 +414,7 @@ static QDF_STATUS send_p2p_lo_stop_cmd_tlv(wmi_unified_t wmi_handle, buf, len, WMI_P2P_LISTEN_OFFLOAD_STOP_CMDID); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Failed to send p2p lo stop: %d", - __func__, status); + wmi_err("Failed to send p2p lo stop: %d", status); wmi_buf_free(buf); return status; } @@ -446,12 +443,12 @@ static QDF_STATUS extract_p2p_lo_stop_ev_param_tlv( param_tlvs = (WMI_P2P_LISTEN_OFFLOAD_STOPPED_EVENTID_param_tlvs *) evt_buf; if (!param_tlvs) { - WMI_LOGE("%s: Invalid P2P lo stop event buffer", __func__); + wmi_err("Invalid P2P lo stop event buffer"); return QDF_STATUS_E_INVAL; } if (!param) { - WMI_LOGE("lo stop event param is null"); + wmi_err("lo stop event param is null"); return QDF_STATUS_E_INVAL; } diff --git a/wmi/src/wmi_unified_pmo_tlv.c b/wmi/src/wmi_unified_pmo_tlv.c index 1e05e3d0f5..34b9af5711 100644 --- a/wmi/src/wmi_unified_pmo_tlv.c +++ b/wmi/src/wmi_unified_pmo_tlv.c @@ -149,7 +149,7 @@ static QDF_STATUS send_add_wow_wakeup_event_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID); if (ret) { - WMI_LOGE("Failed to config wow wakeup event"); + wmi_err("Failed to config wow wakeup event"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -280,7 +280,7 @@ static QDF_STATUS send_wow_patterns_to_fw_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_ADD_WAKE_PATTERN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send wow ptrn to fw", __func__); + wmi_err("Failed to send wow ptrn to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -553,7 +553,7 @@ static QDF_STATUS send_enable_arp_ns_offload_cmd_tlv(wmi_unified_t wmi_handle, res = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SET_ARP_NS_OFFLOAD_CMDID); if (res) { - WMI_LOGE("Failed to enable ARP NDP/NSffload"); + wmi_err("Failed to enable ARP NDP/NSffload"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -605,7 +605,7 @@ static QDF_STATUS send_add_clear_mcbc_filter_cmd_tlv(wmi_unified_t wmi_handle, sizeof(*cmd), WMI_SET_MCASTBCAST_FILTER_CMDID); if (err) { - WMI_LOGE("Failed to send set_param cmd"); + wmi_err("Failed to send set_param cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -682,7 +682,7 @@ send_cmd: len, WMI_SET_MULTIPLE_MCAST_FILTER_CMDID); if (err) { - WMI_LOGE("Failed to send set_param cmd"); + wmi_err("Failed to send set_param cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -698,7 +698,7 @@ static QDF_STATUS send_conf_hw_filter_cmd_tlv(wmi_unified_t wmi, wmi_buf_t wmi_buf; if (!req) { - WMI_LOGE("req is null"); + wmi_err("req is null"); return QDF_STATUS_E_INVAL; } @@ -727,7 +727,7 @@ static QDF_STATUS send_conf_hw_filter_cmd_tlv(wmi_unified_t wmi, status = wmi_unified_cmd_send(wmi, wmi_buf, sizeof(*cmd), WMI_HW_DATA_FILTER_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to configure hw filter"); + wmi_err("Failed to configure hw filter"); wmi_buf_free(wmi_buf); } @@ -824,7 +824,7 @@ QDF_STATUS send_gtk_offload_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id, wmi_mtrace(WMI_GTK_OFFLOAD_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_GTK_OFFLOAD_CMDID)) { - WMI_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID"); + wmi_err("Failed to send WMI_GTK_OFFLOAD_CMDID"); wmi_buf_free(buf); status = QDF_STATUS_E_FAILURE; } @@ -874,7 +874,7 @@ static QDF_STATUS send_process_gtk_offload_getinfo_cmd_tlv( wmi_mtrace(WMI_GTK_OFFLOAD_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_GTK_OFFLOAD_CMDID)) { - WMI_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID for req info"); + wmi_err("Failed to send WMI_GTK_OFFLOAD_CMDID for req info"); wmi_buf_free(buf); status = QDF_STATUS_E_FAILURE; } @@ -927,8 +927,7 @@ QDF_STATUS send_enable_enhance_multicast_offload_tlv( sizeof(*cmd), WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID); if (status != QDF_STATUS_SUCCESS) { wmi_buf_free(buf); - WMI_LOGE("%s:Failed to send ENHANCED_MCAST_FILTER_CMDID", - __func__); + wmi_err("Failed to send ENHANCED_MCAST_FILTER_CMDID"); } return status; @@ -951,12 +950,12 @@ static QDF_STATUS extract_gtk_rsp_event_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_GTK_OFFLOAD_STATUS_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("gtk param_buf is NULL"); + wmi_err("gtk param_buf is NULL"); return QDF_STATUS_E_INVAL; } if (len < sizeof(WMI_GTK_OFFLOAD_STATUS_EVENT_fixed_param)) { - WMI_LOGE("Invalid length for GTK status"); + wmi_err("Invalid length for GTK status"); return QDF_STATUS_E_INVAL; } @@ -1061,7 +1060,7 @@ static QDF_STATUS send_wow_sta_ra_filter_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_ADD_WAKE_PATTERN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send RA rate limit to fw", __func__); + wmi_err("Failed to send RA rate limit to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1126,7 +1125,7 @@ static QDF_STATUS send_action_frame_patterns_cmd_tlv(wmi_unified_t wmi_handle, err = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_SET_ACTION_WAKE_UP_CMDID); if (err) { - WMI_LOGE("Failed to send ap_ps_egap cmd"); + wmi_err("Failed to send ap_ps_egap cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1173,7 +1172,7 @@ static QDF_STATUS send_lphb_config_hbenable_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HB_SET_ENABLE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("cmd_send WMI_HB_SET_ENABLE returned Error %d", + wmi_err("cmd_send WMI_HB_SET_ENABLE returned Error %d", status); wmi_buf_free(buf); } @@ -1227,7 +1226,7 @@ static QDF_STATUS send_lphb_config_tcp_params_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HB_SET_TCP_PARAMS_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("cmd_send WMI_HB_SET_TCP_PARAMS returned Error %d", + wmi_err("cmd_send WMI_HB_SET_TCP_PARAMS returned Error %d", status); wmi_buf_free(buf); } @@ -1278,7 +1277,7 @@ QDF_STATUS send_lphb_config_tcp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HB_SET_TCP_PKT_FILTER_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("cmd_send WMI_HB_SET_TCP_PKT_FILTER returned Error %d", + wmi_err("cmd_send WMI_HB_SET_TCP_PKT_FILTER returned Error %d", status); wmi_buf_free(buf); } @@ -1331,7 +1330,7 @@ static QDF_STATUS send_lphb_config_udp_params_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HB_SET_UDP_PARAMS_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("cmd_send WMI_HB_SET_UDP_PARAMS returned Error %d", + wmi_err("cmd_send WMI_HB_SET_UDP_PARAMS returned Error %d", status); wmi_buf_free(buf); } @@ -1382,7 +1381,7 @@ QDF_STATUS send_lphb_config_udp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HB_SET_UDP_PKT_FILTER_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("cmd_send WMI_HB_SET_UDP_PKT_FILTER returned Error %d", + wmi_err("cmd_send WMI_HB_SET_UDP_PKT_FILTER returned Error %d", status); wmi_buf_free(buf); } @@ -1443,14 +1442,13 @@ static QDF_STATUS send_enable_disable_packet_filter_cmd_tlv( else cmd->enable = PACKET_FILTER_SET_DISABLE; - WMI_LOGE("%s: Packet filter enable %d for vdev_id %d", - __func__, cmd->enable, vdev_id); + wmi_err("Packet filter enable %d for vdev_id %d", cmd->enable, vdev_id); wmi_mtrace(WMI_PACKET_FILTER_ENABLE_CMDID, cmd->vdev_id, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PACKET_FILTER_ENABLE_CMDID); if (ret) { - WMI_LOGE("Failed to send packet filter wmi cmd to fw"); + wmi_err("Failed to send packet filter wmi cmd to fw"); wmi_buf_free(buf); } @@ -1521,14 +1519,14 @@ static QDF_STATUS send_config_packet_filter_cmd_tlv(wmi_unified_t wmi_handle, } } - WMI_LOGE("Packet filter action %d filter with id: %d, num_params=%d", + wmi_err("Packet filter action %d filter with id: %d, num_params=%d", cmd->filter_action, cmd->filter_id, cmd->num_params); /* send the command along with data */ wmi_mtrace(WMI_PACKET_FILTER_CONFIG_CMDID, cmd->vdev_id, 0); err = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PACKET_FILTER_CONFIG_CMDID); if (err) { - WMI_LOGE("Failed to send pkt_filter cmd"); + wmi_err("Failed to send pkt_filter cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1585,7 +1583,7 @@ static QDF_STATUS send_wow_delete_pattern_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_DEL_WAKE_PATTERN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to delete wow ptrn from fw", __func__); + wmi_err("Failed to delete wow ptrn from fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1650,7 +1648,7 @@ static QDF_STATUS send_host_wakeup_ind_to_fw_cmd_tlv(wmi_unified_t wmi_handle) ret = wmi_unified_cmd_send_chk(wmi_handle, buf, len, WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID); if (ret) { - WMI_LOGE("Failed to send host wakeup indication to fw"); + wmi_err("Failed to send host wakeup indication to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1736,8 +1734,7 @@ static QDF_STATUS send_wow_timer_pattern_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WOW_ADD_WAKE_PATTERN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send wake timer pattern to fw", - __func__); + wmi_err("Failed to send wake timer pattern to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1785,7 +1782,7 @@ static QDF_STATUS send_enable_ext_wow_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTWOW_ENABLE_CMDID); if (ret) { - WMI_LOGE("%s: Failed to set EXTWOW Enable", __func__); + wmi_err("Failed to set EXTWOW Enable"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1867,7 +1864,7 @@ static QDF_STATUS send_set_app_type2_params_in_fw_cmd_tlv(wmi_unified_t wmi_hand ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID); if (ret) { - WMI_LOGE("%s: Failed to set APP TYPE2 PARAMS", __func__); + wmi_err("Failed to set APP TYPE2 PARAMS"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1924,7 +1921,7 @@ static QDF_STATUS send_app_type1_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID); if (ret) { - WMI_LOGE("%s: Failed to set APP TYPE1 PARAMS", __func__); + wmi_err("Failed to set APP TYPE1 PARAMS"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } diff --git a/wmi/src/wmi_unified_sta_tlv.c b/wmi/src/wmi_unified_sta_tlv.c index 0f4dceeb3d..f5b29cdf4b 100644 --- a/wmi/src/wmi_unified_sta_tlv.c +++ b/wmi/src/wmi_unified_sta_tlv.c @@ -67,7 +67,7 @@ static QDF_STATUS send_set_sta_sa_query_param_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID)) { - WMI_LOGE(FL("Failed to offload STA SA Query")); + wmi_err("Failed to offload STA SA Query"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -138,7 +138,7 @@ send_set_sta_keep_alive_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_KEEPALIVE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to set KeepAlive"); + wmi_err("Failed to set KeepAlive"); wmi_buf_free(buf); } @@ -194,7 +194,7 @@ static QDF_STATUS send_vdev_set_gtx_cfg_cmd_tlv(wmi_unified_t wmi_handle, uint32 ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_GTX_PARAMS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to set GTX PARAMS"); + wmi_err("Failed to set GTX PARAMS"); wmi_buf_free(buf); } return ret; @@ -240,8 +240,8 @@ static QDF_STATUS send_process_dhcp_ind_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PEER_SET_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" - " returned Error %d", __func__, status); + wmi_err("wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" + " returned Error %d", status); wmi_buf_free(buf); } @@ -284,7 +284,7 @@ static QDF_STATUS send_get_link_speed_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID)) { - WMI_LOGE("%s: failed to send link speed command", __func__); + wmi_err("Failed to send link speed command"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -330,7 +330,7 @@ static QDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_TRIGGER_CMDID); if (ret) { - WMI_LOGE("PROFILE_TRIGGER cmd Failed with value %d", + wmi_err("PROFILE_TRIGGER cmd Failed with value %d", value1); wmi_buf_free(buf); return ret; @@ -355,7 +355,7 @@ static QDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID); if (ret) { - WMI_LOGE("PROFILE_DATA cmd Failed for id %d value %d", + wmi_err("PROFILE_DATA cmd Failed for id %d value %d", value1, value2); wmi_buf_free(buf); return ret; @@ -382,7 +382,7 @@ static QDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID); if (ret) { - WMI_LOGE("HIST_INTVL cmd Failed for id %d value %d", + wmi_err("HIST_INTVL cmd Failed for id %d value %d", value1, value2); wmi_buf_free(buf); return ret; @@ -410,7 +410,7 @@ static QDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID); if (ret) { - WMI_LOGE("enable cmd Failed for id %d value %d", + wmi_err("enable cmd Failed for id %d value %d", value1, value2); wmi_buf_free(buf); return ret; @@ -487,8 +487,7 @@ static QDF_STATUS send_wlm_latency_level_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_WLM_CONFIG_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLM_CONFIG_CMDID)) { - WMI_LOGE("%s: Failed to send setting latency config command", - __func__); + wmi_err("Failed to send setting latency config command"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -869,8 +868,7 @@ send_update_tdls_peer_state_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_TDLS_PEER_UPDATE_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_TDLS_PEER_UPDATE_CMDID)) { - WMI_LOGE("%s: failed to send tdls peer update state command", - __func__); + wmi_err("Failed to send tdls peer update state command"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -894,7 +892,7 @@ static QDF_STATUS extract_vdev_tdls_ev_param_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_TDLS_PEER_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: NULL param_buf", __func__); + wmi_err("NULL param_buf"); return QDF_STATUS_E_NULL_VALUE; } @@ -919,8 +917,8 @@ static QDF_STATUS extract_vdev_tdls_ev_param_tlv(wmi_unified_t wmi_handle, param->message_type = TDLS_CONNECTION_TRACKER_NOTIFY; break; default: - WMI_LOGE("%s: Discarding unknown tdls event %d from target", - __func__, evt->peer_status); + wmi_err("Discarding unknown tdls event %d from target", + evt->peer_status); return QDF_STATUS_E_INVAL; }; @@ -966,8 +964,8 @@ static QDF_STATUS extract_vdev_tdls_ev_param_tlv(wmi_unified_t wmi_handle, break; default: - WMI_LOGE("%s: unknown reason %d in tdls event %d from target", - __func__, evt->peer_reason, evt->peer_status); + wmi_err("Unknown reason %d in tdls event %d from target", + evt->peer_reason, evt->peer_status); return QDF_STATUS_E_INVAL; }; @@ -1049,7 +1047,7 @@ static QDF_STATUS send_process_set_ie_info_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_IE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to send set IE command ret = %d"), ret); + wmi_err("Failed to send set IE command ret = %d", ret); wmi_buf_free(buf); } @@ -1091,7 +1089,7 @@ static QDF_STATUS send_set_base_macaddr_indicate_cmd_tlv(wmi_unified_t wmi_handl sizeof(*cmd), WMI_PDEV_SET_BASE_MACADDR_CMDID); if (err) { - WMI_LOGE("Failed to send set_base_macaddr cmd"); + wmi_err("Failed to send set_base_macaddr cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1213,7 +1211,7 @@ send_reject_ap_list_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_DSM_FILTER_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("wmi_unified_cmd_send WMI_PDEV_DSM_FILTER_CMDID returned Error %d", + wmi_err("wmi_unified_cmd_send WMI_PDEV_DSM_FILTER_CMDID returned Error %d", status); goto error; } @@ -1306,7 +1304,7 @@ send_sar_limits: WMI_SAR_LIMITS_CMDID); if (QDF_IS_STATUS_ERROR(qdf_status)) { - WMI_LOGE("Failed to send WMI_SAR_LIMITS_CMDID"); + wmi_err("Failed to send WMI_SAR_LIMITS_CMDID"); wmi_buf_free(buf); } @@ -1342,7 +1340,7 @@ static QDF_STATUS get_sar_limit_cmd_tlv(wmi_unified_t wmi_handle) status = wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_SAR_GET_LIMITS_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE(FL("Failed to send get SAR limit cmd: %d"), status); + wmi_err("Failed to send get SAR limit cmd: %d", status); wmi_buf_free(wmi_buf); } @@ -1418,11 +1416,11 @@ static QDF_STATUS extract_sar_limit_event_tlv(wmi_unified_t wmi_handle, uint32_t row; if (!evt_buf) { - WMI_LOGE(FL("input event is NULL")); + wmi_err("input event is NULL"); return QDF_STATUS_E_INVAL; } if (!event) { - WMI_LOGE(FL("output event is NULL")); + wmi_err("output event is NULL"); return QDF_STATUS_E_INVAL; } @@ -1430,7 +1428,7 @@ static QDF_STATUS extract_sar_limit_event_tlv(wmi_unified_t wmi_handle, fixed_param = param_buf->fixed_param; if (!fixed_param) { - WMI_LOGE(FL("Invalid fixed param")); + wmi_err("Invalid fixed param"); return QDF_STATUS_E_INVAL; } @@ -1438,14 +1436,14 @@ static QDF_STATUS extract_sar_limit_event_tlv(wmi_unified_t wmi_handle, event->num_limit_rows = fixed_param->num_limit_rows; if (event->num_limit_rows > param_buf->num_sar_get_limits) { - WMI_LOGE(FL("Num rows %d exceeds sar_get_limits rows len %d"), + wmi_err("Num rows %d exceeds sar_get_limits rows len %d", event->num_limit_rows, param_buf->num_sar_get_limits); return QDF_STATUS_E_INVAL; } if (event->num_limit_rows > MAX_SAR_LIMIT_ROWS_SUPPORTED) { QDF_ASSERT(0); - WMI_LOGE(FL("Num rows %d exceeds max of %d"), + wmi_err("Num rows %d exceeds max of %d", event->num_limit_rows, MAX_SAR_LIMIT_ROWS_SUPPORTED); event->num_limit_rows = MAX_SAR_LIMIT_ROWS_SUPPORTED; @@ -1543,8 +1541,8 @@ send_cmd: status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_UPDATE_PMK_CACHE_CMDID); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: failed to send set del pmkid cache command %d", - __func__, status); + wmi_err("Failed to send set del pmkid cache command %d", + status); wmi_buf_free(buf); } @@ -1757,8 +1755,7 @@ static QDF_STATUS send_process_add_periodic_tx_ptrn_cmd_tlv( wmi_mtrace(WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { - WMI_LOGE("%s: failed to add pattern set state command", - __func__); + wmi_err("Failed to add pattern set state command"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -1804,7 +1801,7 @@ static QDF_STATUS send_process_del_periodic_tx_ptrn_cmd_tlv( wmi_mtrace(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { - WMI_LOGE("%s: failed to send del pattern command", __func__); + wmi_err("Failed to send del pattern command"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -1849,8 +1846,7 @@ static QDF_STATUS send_set_auto_shutdown_timer_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("%s: WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID Err %d", - __func__, status); + wmi_err("WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID Err %d", status); wmi_buf_free(buf); } @@ -1891,8 +1887,8 @@ static QDF_STATUS send_set_led_flashing_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_LED_FLASHING_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" - " returned Error %d", __func__, status); + wmi_err("wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" + " returned Error %d", status); wmi_buf_free(buf); } @@ -1930,9 +1926,9 @@ static QDF_STATUS send_process_ch_avoid_update_cmd_tlv(wmi_unified_t wmi_handle) status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_CHAN_AVOID_UPDATE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("wmi_unified_cmd_send" - " WMITLV_TABLE_WMI_CHAN_AVOID_UPDATE" - " returned Error %d", status); + wmi_err("wmi_unified_cmd_send" + " WMITLV_TABLE_WMI_CHAN_AVOID_UPDATE" + " returned Error %d", status); wmi_buf_free(buf); } @@ -1996,7 +1992,7 @@ static QDF_STATUS send_pdev_set_pcl_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_SET_PCL_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_PCL_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_PDEV_SET_PCL_CMDID", __func__); + wmi_err("Failed to send WMI_PDEV_SET_PCL_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2045,8 +2041,7 @@ QDF_STATUS send_pdev_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_SET_MAC_CONFIG_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_MAC_CONFIG_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_PDEV_SET_MAC_CONFIG_CMDID", - __func__); + wmi_err("Failed to send WMI_PDEV_SET_MAC_CONFIG_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2116,7 +2111,7 @@ QDF_STATUS send_adapt_dwelltime_params_cmd_tlv(wmi_unified_t wmi_handle, err = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SCAN_ADAPTIVE_DWELL_CONFIG_CMDID); if (err) { - WMI_LOGE("Failed to send adapt dwelltime cmd err=%d", err); + wmi_err("Failed to send adapt dwelltime cmd err=%d", err); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2182,7 +2177,7 @@ static QDF_STATUS send_dbs_scan_sel_params_cmd_tlv(wmi_unified_t wmi_handle, err = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SET_SCAN_DBS_DUTY_CYCLE_CMDID); if (QDF_IS_STATUS_ERROR(err)) { - WMI_LOGE("Failed to send dbs scan selection cmd err=%d", err); + wmi_err("Failed to send dbs scan selection cmd err=%d", err); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2271,8 +2266,7 @@ static QDF_STATUS send_set_arp_stats_req_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_ARP_STAT_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_SET_ARP_STATS_CMDID failed, Error %d", - status); + wmi_err("WMI_SET_ARP_STATS_CMDID failed, Error %d", status); goto error; } @@ -2324,8 +2318,7 @@ static QDF_STATUS send_get_arp_stats_req_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_GET_ARP_STAT_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_GET_ARP_STATS_CMDID failed, Error %d", - status); + wmi_err("WMI_GET_ARP_STATS_CMDID failed, Error %d", status); goto error; } @@ -2399,8 +2392,8 @@ static QDF_STATUS send_peer_unmap_conf_cmd_tlv(wmi_unified_t wmi, status = wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_UNMAP_RESPONSE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("%s: Failed to send peer unmap conf command: Err[%d]", - __func__, status); + wmi_err("Failed to send peer unmap conf command: Err[%d]", + status); wmi_buf_free(buf); return status; } @@ -2442,7 +2435,7 @@ send_ocl_cmd_tlv(wmi_unified_t wmi_handle, struct ocl_cmd_params *param) WMI_SET_OCL_CMDID); if (ret != 0) { - WMI_LOGE("Sending OCL CMD failed"); + wmi_err("Sending OCL CMD failed"); wmi_buf_free(buf); } diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 12abf97f67..b5c0b280ba 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -579,7 +579,7 @@ static uint32_t convert_target_pdev_id_to_host_pdev_id(wmi_unified_t wmi_handle, } else if (pdev_id == WMI_PDEV_ID_SOC) { return WMI_HOST_PDEV_ID_SOC; } else { - WMI_LOGE("Invalid pdev_id"); + wmi_err("Invalid pdev_id"); } return WMI_HOST_PDEV_ID_INVALID; @@ -791,7 +791,7 @@ static QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_VDEV_CREATE_CMDID, cmd->vdev_id, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_CREATE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_VDEV_CREATE_CMDID"); + wmi_err("Failed to send WMI_VDEV_CREATE_CMDID"); wmi_buf_free(buf); } @@ -827,7 +827,7 @@ static QDF_STATUS send_vdev_delete_cmd_tlv(wmi_unified_t wmi_handle, sizeof(wmi_vdev_delete_cmd_fixed_param), WMI_VDEV_DELETE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_VDEV_DELETE_CMDID"); + wmi_err("Failed to send WMI_VDEV_DELETE_CMDID"); wmi_buf_free(buf); } WMI_LOGD("%s:vdev id = %d", __func__, if_id); @@ -883,7 +883,7 @@ send_vdev_nss_chain_params_cmd_tlv(wmi_unified_t wmi_handle, sizeof(wmi_vdev_chainmask_config_cmd_fixed_param), WMI_VDEV_CHAINMASK_CONFIG_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_VDEV_CHAINMASK_CONFIG_CMDID"); + wmi_err("Failed to send WMI_VDEV_CHAINMASK_CONFIG_CMDID"); wmi_buf_free(buf); } WMI_LOGD("%s: vdev_id %d", __func__, vdev_id); @@ -1292,7 +1292,7 @@ static QDF_STATUS send_peer_param_cmd_tlv(wmi_unified_t wmi, sizeof(wmi_peer_set_param_cmd_fixed_param), WMI_PEER_SET_PARAM_CMDID); if (err) { - WMI_LOGE("Failed to send set_param cmd"); + wmi_err("Failed to send set_param cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1516,7 +1516,7 @@ static QDF_STATUS send_green_ap_ps_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID)) { - WMI_LOGE("Set Green AP PS param Failed val %d", value); + wmi_err("Set Green AP PS param Failed val %d", value); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1601,7 +1601,7 @@ send_pdev_utf_cmd_tlv(wmi_unified_t wmi_handle, WMI_PDEV_UTF_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_PDEV_UTF_CMDID command"); + wmi_err("Failed to send WMI_PDEV_UTF_CMDID command"); wmi_buf_free(buf); break; } @@ -1679,7 +1679,7 @@ send_pdev_param_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set param command ret = %d", ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } return ret; @@ -1726,8 +1726,7 @@ static QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_SET_HW_MODE_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_HW_MODE_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_PDEV_SET_HW_MODE_CMDID", - __func__); + wmi_err("Failed to send WMI_PDEV_SET_HW_MODE_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1780,7 +1779,7 @@ static QDF_STATUS send_suspend_cmd_tlv(wmi_unified_t wmi_handle, WMI_PDEV_SUSPEND_CMDID); if (ret) { wmi_buf_free(wmibuf); - WMI_LOGE("Failed to send WMI_PDEV_SUSPEND_CMDID command"); + wmi_err("Failed to send WMI_PDEV_SUSPEND_CMDID command"); } return ret; @@ -1815,7 +1814,7 @@ static QDF_STATUS send_resume_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmibuf, sizeof(*cmd), WMI_PDEV_RESUME_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_PDEV_RESUME_CMDID command"); + wmi_err("Failed to send WMI_PDEV_RESUME_CMDID command"); wmi_buf_free(wmibuf); } @@ -1903,7 +1902,7 @@ static QDF_STATUS send_set_ap_ps_param_cmd_tlv(wmi_unified_t wmi_handle, err = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_AP_PS_PEER_PARAM_CMDID); if (err) { - WMI_LOGE("Failed to send set_ap_ps_param cmd"); + wmi_err("Failed to send set_ap_ps_param cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1942,7 +1941,7 @@ static QDF_STATUS send_set_sta_ps_param_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_STA_POWERSAVE_PARAM_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_POWERSAVE_PARAM_CMDID)) { - WMI_LOGE("Set Sta Ps param Failed vdevId %d Param %d val %d", + wmi_err("Set Sta Ps param Failed vdevId %d Param %d val %d", param->vdev_id, param->param_id, param->value); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; @@ -1982,8 +1981,7 @@ static QDF_STATUS send_crash_inject_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_FORCE_FW_HANG_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send set param command, ret = %d", - __func__, ret); + wmi_err("Failed to send set param command, ret = %d", ret); wmi_buf_free(buf); } @@ -2109,7 +2107,7 @@ static QDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set param command ret = %d", ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } @@ -2169,7 +2167,7 @@ static QDF_STATUS send_peer_based_pktlog_cmd(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_FILTER_CMDID); if (ret) { - WMI_LOGE("Failed to send peer based pktlog command to FW =%d" + wmi_err("Failed to send peer based pktlog command to FW =%d" , ret); wmi_buf_free(buf); } @@ -2213,7 +2211,7 @@ static QDF_STATUS send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_ENABLE_CMDID); if (ret) { - WMI_LOGE("Failed to send pktlog enable cmd to FW =%d", ret); + wmi_err("Failed to send pktlog enable cmd to FW =%d", ret); wmi_buf_free(buf); } @@ -2249,7 +2247,7 @@ static QDF_STATUS send_packet_log_disable_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_DISABLE_CMDID); if (ret) { - WMI_LOGE("Failed to send pktlog disable cmd to FW =%d", ret); + wmi_err("Failed to send pktlog disable cmd to FW =%d", ret); wmi_buf_free(buf); } @@ -2303,7 +2301,7 @@ static void send_time_stamp_sync_cmd_tlv(wmi_unified_t wmi_handle) status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_DBGLOG_TIME_STAMP_SYNC_CMDID); if (status) { - WMI_LOGE("Failed to send WMI_DBGLOG_TIME_STAMP_SYNC_CMDID command"); + wmi_err("Failed to send WMI_DBGLOG_TIME_STAMP_SYNC_CMDID command"); wmi_buf_free(buf); } @@ -2349,7 +2347,7 @@ static QDF_STATUS send_fd_tmpl_cmd_tlv(wmi_unified_t wmi_handle, wmi_buf, wmi_buf_len, WMI_FD_TMPL_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send fd tmpl: %d", __func__, ret); + wmi_err("Failed to send fd tmpl: %d", ret); wmi_buf_free(wmi_buf); return ret; } @@ -2416,7 +2414,7 @@ static QDF_STATUS send_beacon_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmi_buf, wmi_buf_len, WMI_BCN_TMPL_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send bcn tmpl: %d", __func__, ret); + wmi_err("Failed to send bcn tmpl: %d", ret); wmi_buf_free(wmi_buf); } @@ -2987,7 +2985,7 @@ static QDF_STATUS send_scan_start_cmd_tlv(wmi_unified_t wmi_handle, (params->chan_list.num_chan * sizeof(uint32_t)); if (params->num_ssids > WLAN_SCAN_MAX_NUM_SSID) { - WMI_LOGE("Invalid value for num_ssids %d", params->num_ssids); + wmi_err("Invalid value for num_ssids %d", params->num_ssids); goto error; } @@ -3083,7 +3081,7 @@ static QDF_STATUS send_scan_start_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_START_SCAN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to start scan: %d", __func__, ret); + wmi_err("Failed to start scan: %d", ret); wmi_buf_free(wmi_buf); } return ret; @@ -3137,7 +3135,7 @@ static QDF_STATUS send_scan_stop_cmd_tlv(wmi_unified_t wmi_handle, } else if (param->req_type == WLAN_SCAN_CANCEL_HOST_VDEV_ALL) { cmd->req_type = WMI_SCN_STOP_HOST_VAP_ALL; } else { - WMI_LOGE("%s: Invalid Command : ", __func__); + wmi_err("Invalid Scan cancel req type: %d", param->req_type); wmi_buf_free(wmi_buf); return QDF_STATUS_E_INVAL; } @@ -3146,7 +3144,7 @@ static QDF_STATUS send_scan_stop_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_STOP_SCAN_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send stop scan: %d", __func__, ret); + wmi_err("Failed to send stop scan: %d", ret); wmi_buf_free(wmi_buf); } @@ -3323,7 +3321,7 @@ static QDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle, buf, len, WMI_SCAN_CHAN_LIST_CMDID); if (QDF_IS_STATUS_ERROR(qdf_status)) { - WMI_LOGE("Failed to send WMI_SCAN_CHAN_LIST_CMDID"); + wmi_err("Failed to send WMI_SCAN_CHAN_LIST_CMDID"); wmi_buf_free(buf); goto end; } @@ -3396,8 +3394,8 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, mgmt_tx_dl_frm_len; if (param->frm_len > mgmt_tx_dl_frm_len) { - WMI_LOGE("%s:mgmt frame len %u exceeds %u", - __func__, param->frm_len, mgmt_tx_dl_frm_len); + wmi_err("mgmt frame len %u exceeds %u", + param->frm_len, mgmt_tx_dl_frm_len); return QDF_STATUS_E_INVAL; } @@ -3438,8 +3436,7 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, if (param->tx_params_valid) { if (populate_tx_send_params(bufp, param->tx_param) != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Populate TX send params failed", - __func__); + wmi_err("Populate TX send params failed"); goto free_buf; } cmd_len += sizeof(wmi_tx_send_params); @@ -3448,7 +3445,7 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_MGMT_TX_SEND_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, cmd_len, WMI_MGMT_TX_SEND_CMDID)) { - WMI_LOGE("%s: Failed to send mgmt Tx", __func__); + wmi_err("Failed to send mgmt Tx"); goto free_buf; } return QDF_STATUS_SUCCESS; @@ -3506,7 +3503,7 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, status = qdf_nbuf_map_single(qdf_ctx, param->tx_frame, QDF_DMA_TO_DEVICE); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: wmi buf map failed", __func__); + wmi_err("wmi buf map failed"); goto free_buf; } @@ -3527,8 +3524,7 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, if (param->tx_params_valid) { status = populate_tx_send_params(bufp, param->tx_param); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Populate TX send params failed", - __func__); + wmi_err("Populate TX send params failed"); goto unmap_tx_frame; } cmd_len += sizeof(wmi_tx_send_params); @@ -3537,7 +3533,7 @@ static QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_MGMT_TX_SEND_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, cmd_len, WMI_MGMT_TX_SEND_CMDID)) { - WMI_LOGE("%s: Failed to send mgmt Tx", __func__); + wmi_err("Failed to send mgmt Tx"); goto unmap_tx_frame; } return QDF_STATUS_SUCCESS; @@ -3612,8 +3608,7 @@ static QDF_STATUS send_offchan_data_tx_cmd_tlv(wmi_unified_t wmi_handle, if (param->tx_params_valid) { status = populate_tx_send_params(bufp, param->tx_param); if (status != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Populate TX send params failed", - __func__); + wmi_err("Populate TX send params failed"); goto err1; } cmd_len += sizeof(wmi_tx_send_params); @@ -3622,7 +3617,7 @@ static QDF_STATUS send_offchan_data_tx_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_OFFCHAN_DATA_TX_SEND_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, cmd_len, WMI_OFFCHAN_DATA_TX_SEND_CMDID)) { - WMI_LOGE("%s: Failed to offchan data Tx", __func__); + wmi_err("Failed to offchan data Tx"); goto err1; } @@ -3664,7 +3659,7 @@ static QDF_STATUS send_modem_power_state_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_MODEM_POWER_STATE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send notify cmd ret = %d", ret); + wmi_err("Failed to send notify cmd ret = %d", ret); wmi_buf_free(buf); } @@ -3706,7 +3701,7 @@ static QDF_STATUS send_set_sta_ps_mode_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_STA_POWERSAVE_MODE_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_POWERSAVE_MODE_CMDID)) { - WMI_LOGE("Set Sta Mode Ps Failed vdevId %d val %d", + wmi_err("Set Sta Mode Ps Failed vdevId %d val %d", vdev_id, val); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; @@ -3796,7 +3791,7 @@ static QDF_STATUS send_set_mimops_cmd_tlv(wmi_unified_t wmi_handle, cmd->forced_mode = WMI_SMPS_FORCED_MODE_DYNAMIC; break; default: - WMI_LOGE("%s:INVALID Mimo PS CONFIG", __func__); + wmi_err("INVALID MIMO PS CONFIG: %d", value); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -3807,7 +3802,7 @@ static QDF_STATUS send_set_mimops_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_SMPS_FORCE_MODE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set Mimo PS ret = %d", ret); + wmi_err("Failed to send set Mimo PS ret = %d", ret); wmi_buf_free(buf); } @@ -3852,7 +3847,7 @@ static QDF_STATUS send_set_smps_params_cmd_tlv(wmi_unified_t wmi_handle, uint8_t ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_STA_SMPS_PARAM_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set Mimo PS ret = %d", ret); + wmi_err("Failed to send set Mimo PS ret = %d", ret); wmi_buf_free(buf); } @@ -3873,7 +3868,7 @@ static QDF_STATUS send_get_temperature_cmd_tlv(wmi_unified_t wmi_handle) uint8_t *buf_ptr; if (!wmi_handle) { - WMI_LOGE(FL("WMI is closed, can not issue cmd")); + wmi_err("WMI is closed, can not issue cmd"); return QDF_STATUS_E_INVAL; } @@ -3892,7 +3887,7 @@ static QDF_STATUS send_get_temperature_cmd_tlv(wmi_unified_t wmi_handle) wmi_mtrace(WMI_PDEV_GET_TEMPERATURE_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_PDEV_GET_TEMPERATURE_CMDID)) { - WMI_LOGE(FL("failed to send get temperature command")); + wmi_err("Failed to send get temperature command"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -3974,7 +3969,7 @@ static QDF_STATUS send_set_sta_uapsd_auto_trig_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, cmd_len, WMI_STA_UAPSD_AUTO_TRIG_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set uapsd param ret = %d", ret); + wmi_err("Failed to send set uapsd param ret = %d", ret); wmi_buf_free(buf); } @@ -4018,8 +4013,8 @@ static QDF_STATUS send_set_thermal_mgmt_cmd_tlv(wmi_unified_t wmi_handle, break; default: - WMI_LOGE("invalid thermal_action code %d", - thermal_info->thermal_action); + wmi_err("Invalid thermal_action code %d", + thermal_info->thermal_action); return QDF_STATUS_E_FAILURE; } @@ -4041,7 +4036,7 @@ static QDF_STATUS send_set_thermal_mgmt_cmd_tlv(wmi_unified_t wmi_handle, cmd->enable = thermal_info->thermal_enable; cmd->action = action; - WMI_LOGD("TM Sending thermal mgmt cmd: low temp %d, upper temp %d, enabled %d action %d", + wmi_debug("TM Sending thermal mgmt cmd: low temp %d, upper temp %d, enabled %d action %d", cmd->lower_thresh_degreeC, cmd->upper_thresh_degreeC, cmd->enable, cmd->action); @@ -4050,7 +4045,7 @@ static QDF_STATUS send_set_thermal_mgmt_cmd_tlv(wmi_unified_t wmi_handle, WMI_THERMAL_MGMT_CMDID); if (QDF_IS_STATUS_ERROR(status)) { wmi_buf_free(buf); - WMI_LOGE("%s:Failed to send thermal mgmt command", __func__); + wmi_err("Failed to send thermal mgmt command"); } return status; @@ -4135,7 +4130,7 @@ static QDF_STATUS send_lro_config_cmd_tlv(wmi_unified_t wmi_handle, sizeof(*cmd), WMI_LRO_CONFIG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { wmi_buf_free(buf); - WMI_LOGE("%s:Failed to send WMI_LRO_CONFIG_CMDID", __func__); + wmi_err("Failed to send WMI_LRO_CONFIG_CMDID"); } return status; @@ -4190,7 +4185,7 @@ static QDF_STATUS send_peer_rate_report_cmd_tlv(wmi_unified_t wmi_handle, } } - WMI_LOGE("%s enable %d backoff_time %d period %d", __func__, + wmi_err("enable %d backoff_time %d period %d", cmd->enable_rate_report, cmd->report_backoff_time, cmd->report_timer_period); @@ -4199,8 +4194,7 @@ static QDF_STATUS send_peer_rate_report_cmd_tlv(wmi_unified_t wmi_handle, WMI_PEER_SET_RATE_REPORT_CONDITION_CMDID); if (QDF_IS_STATUS_ERROR(status)) { wmi_buf_free(buf); - WMI_LOGE("%s:Failed to send peer_set_report_cond command", - __func__); + wmi_err("Failed to send peer_set_report_cond command"); } return status; } @@ -4267,7 +4261,7 @@ static QDF_STATUS send_process_update_edca_param_cmd_tlv(wmi_unified_t wmi_handl fail: wmi_buf_free(buf); - WMI_LOGE("%s: Failed to set WMM Paremeters", __func__); + wmi_err("Failed to set WMM Parameters"); return QDF_STATUS_E_FAILURE; } @@ -4300,8 +4294,8 @@ static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle, tmpl_len_aligned; if (wmi_buf_len > WMI_BEACON_TX_BUFFER_SIZE) { - WMI_LOGE(FL("wmi_buf_len: %d > %d. Can't send wmi cmd"), - wmi_buf_len, WMI_BEACON_TX_BUFFER_SIZE); + wmi_err("wmi_buf_len: %d > %d. Can't send wmi cmd", + wmi_buf_len, WMI_BEACON_TX_BUFFER_SIZE); return QDF_STATUS_E_INVAL; } @@ -4335,7 +4329,7 @@ static QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmi_buf, wmi_buf_len, WMI_PRB_TMPL_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("Failed to send PRB RSP tmpl: %d"), ret); + wmi_err("Failed to send PRB RSP tmpl: %d", ret); wmi_buf_free(wmi_buf); } @@ -4479,7 +4473,7 @@ static QDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle, should not exceed more than 251 bytes */ if (ie_len > 251) { - WMI_LOGE("%s : invalid p2p ie length %u", __func__, ie_len); + wmi_err("Invalid p2p ie length %u", ie_len); return QDF_STATUS_E_INVAL; } @@ -4515,7 +4509,7 @@ static QDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle, wmi_buf, wmi_buf_len, WMI_P2P_GO_SET_BEACON_IE); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send bcn tmpl: %d", ret); + wmi_err("Failed to send bcn tmpl: %d", ret); wmi_buf_free(wmi_buf); } @@ -4590,7 +4584,7 @@ static QDF_STATUS send_scan_probe_setoui_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_SCAN_PROB_REQ_OUI_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_SCAN_PROB_REQ_OUI_CMDID)) { - WMI_LOGE("%s: failed to send command", __func__); + wmi_err("Failed to send command WMI_SCAN_PROB_REQ_OUI_CMDID"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -4635,7 +4629,7 @@ static QDF_STATUS send_ipa_offload_control_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len, WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)) { - WMI_LOGE("%s: failed to command", __func__); + wmi_err("Failed to send WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID"); wmi_buf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } @@ -4696,7 +4690,7 @@ static QDF_STATUS send_pno_stop_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_i ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send nlo wmi cmd", __func__); + wmi_err("Failed to send nlo wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -4845,7 +4839,7 @@ static QDF_STATUS send_nlo_mawc_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NLO_CONFIGURE_MAWC_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("WMI_NLO_CONFIGURE_MAWC_CMDID failed, Error %d", + wmi_err("WMI_NLO_CONFIGURE_MAWC_CMDID failed, Error %d", status); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; @@ -5061,7 +5055,7 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send nlo wmi cmd", __func__); + wmi_err("Failed to send nlo wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5119,7 +5113,7 @@ static QDF_STATUS send_process_ll_stats_clear_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_CLEAR_LINK_STATS_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send clear link stats req", __func__); + wmi_err("Failed to send clear link stats req"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5171,7 +5165,7 @@ static QDF_STATUS send_process_ll_stats_set_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_START_LINK_STATS_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send set link stats request", __func__); + wmi_err("Failed to send set link stats request"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5225,7 +5219,7 @@ static QDF_STATUS send_process_ll_stats_get_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send_pm_chk(wmi_handle, buf, len, WMI_REQUEST_LINK_STATS_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send get link stats request", __func__); + wmi_err("Failed to send get link stats request"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5269,8 +5263,7 @@ static QDF_STATUS send_congestion_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_REQUEST_STATS_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_REQUEST_STATS_CMDID", - __func__); + wmi_err("Failed to send WMI_REQUEST_STATS_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5304,7 +5297,7 @@ static QDF_STATUS send_snr_request_cmd_tlv(wmi_unified_t wmi_handle) wmi_mtrace(WMI_REQUEST_STATS_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { - WMI_LOGE("Failed to send host stats request to fw"); + wmi_err("Failed to send host stats request to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5340,7 +5333,7 @@ static QDF_STATUS send_snr_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id) wmi_mtrace(WMI_REQUEST_STATS_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { - WMI_LOGE("Failed to send host stats request to fw"); + wmi_err("Failed to send host stats request to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5376,7 +5369,7 @@ static QDF_STATUS send_link_status_req_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_REQUEST_STATS_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { - WMI_LOGE("Failed to send WMI link status request to fw"); + wmi_err("Failed to send WMI link status request to fw"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5417,7 +5410,7 @@ static QDF_STATUS send_egap_conf_params_cmd_tlv(wmi_unified_t wmi_handle, err = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_AP_PS_EGAP_PARAM_CMDID); if (err) { - WMI_LOGE("Failed to send ap_ps_egap cmd"); + wmi_err("Failed to send ap_ps_egap cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5495,7 +5488,7 @@ static QDF_STATUS send_oem_dma_cfg_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cfg), WMI_OEM_DMA_RING_CFG_REQ_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL(":wmi cmd send failed")); + wmi_err("Failed to send WMI_OEM_DMA_RING_CFG_REQ_CMDID"); wmi_buf_free(buf); } @@ -5542,7 +5535,7 @@ static QDF_STATUS send_start_11d_scan_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_11D_SCAN_START_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send start 11d scan wmi cmd", __func__); + wmi_err("Failed to send start 11d scan wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5587,7 +5580,7 @@ static QDF_STATUS send_stop_11d_scan_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_11D_SCAN_STOP_CMDID); if (ret) { - WMI_LOGE("%s: Failed to send stop 11d scan wmi cmd", __func__); + wmi_err("Failed to send stop 11d scan wmi cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5632,7 +5625,7 @@ static QDF_STATUS send_start_oem_data_cmd_tlv(wmi_unified_t wmi_handle, WMI_TLV_HDR_SIZE), WMI_OEM_REQ_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL(":wmi cmd send failed")); + wmi_err("Failed to send WMI_OEM_REQ_CMDID"); wmi_buf_free(buf); } @@ -5769,8 +5762,8 @@ send_dfs_phyerr_filter_offload_en_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_DFS_PHYERR_FILTER_DIS_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send WMI_DFS_PHYERR_FILTER_DIS_CMDID ret=%d", - __func__, ret); + wmi_err("Failed to send WMI_DFS_PHYERR_FILTER_DIS_CMDID ret=%d", + ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5804,8 +5797,7 @@ send_dfs_phyerr_filter_offload_en_cmd_tlv(wmi_unified_t wmi_handle, WMI_DFS_PHYERR_FILTER_ENA_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send DFS PHYERR CMD ret=%d", - __func__, ret); + wmi_err("Failed to send DFS PHYERR CMD ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5868,7 +5860,7 @@ static QDF_STATUS send_pktlog_wmi_send_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_PKTLOG_ENABLE_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_ENABLE_CMDID)) { - WMI_LOGE("failed to send pktlog enable cmdid"); + wmi_err("Failed to send pktlog enable cmdid"); goto wmi_send_failed; } break; @@ -5891,7 +5883,7 @@ static QDF_STATUS send_pktlog_wmi_send_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_PKTLOG_DISABLE_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_PKTLOG_DISABLE_CMDID)) { - WMI_LOGE("failed to send pktlog disable cmdid"); + wmi_err("failed to send pktlog disable cmdid"); goto wmi_send_failed; } break; @@ -5961,8 +5953,7 @@ static QDF_STATUS send_stats_ext_req_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_STATS_EXT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send notify cmd ret = %d", __func__, - ret); + wmi_err("Failed to send notify cmd ret = %d", ret); wmi_buf_free(buf); } @@ -6004,7 +5995,7 @@ send_process_dhcpserver_offload_cmd_tlv(wmi_unified_t wmi_handle, sizeof(*cmd), WMI_SET_DHCP_SERVER_OFFLOAD_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send set_dhcp_server_offload cmd"); + wmi_err("Failed to send set_dhcp_server_offload cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6052,8 +6043,7 @@ send_pdev_set_regdomain_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_PDEV_SET_REGDOMAIN_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_REGDOMAIN_CMDID)) { - WMI_LOGE("%s: Failed to send pdev set regdomain command", - __func__); + wmi_err("Failed to send pdev set regdomain command"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6175,7 +6165,7 @@ static QDF_STATUS send_vdev_set_custom_aggr_size_cmd_tlv( wmi_mtrace(WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID)) { - WMI_LOGE("Seting custom aggregation size failed"); + wmi_err("Setting custom aggregation size failed"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6203,7 +6193,7 @@ static QDF_STATUS send_vdev_set_qdepth_thresh_cmd_tlv(wmi_unified_t wmi_handle, QDF_STATUS ret; if (param->num_of_msduq_updates > QDEPTH_THRESH_MAX_UPDATES) { - WMI_LOGE("%s: Invalid Update Count!", __func__); + wmi_err("Invalid Update Count!"); return QDF_STATUS_E_INVAL; } @@ -6267,7 +6257,7 @@ static QDF_STATUS send_vdev_set_qdepth_thresh_cmd_tlv(wmi_unified_t wmi_handle, WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID); if (ret != 0) { - WMI_LOGE(" %s :WMI Failed", __func__); + wmi_err("Failed to send WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID"); wmi_buf_free(buf); } @@ -6304,7 +6294,7 @@ send_set_vap_dscp_tid_map_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_VDEV_SET_DSCP_TID_MAP_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_DSCP_TID_MAP_CMDID)) { - WMI_LOGE("Failed to set dscp cmd"); + wmi_err("Failed to set dscp cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6341,7 +6331,7 @@ static QDF_STATUS send_vdev_set_fwtest_param_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_FWTEST_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_FWTEST_CMDID)) { - WMI_LOGE("Setting FW test param failed"); + wmi_err("Setting FW test param failed"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6383,7 +6373,7 @@ static QDF_STATUS send_phyerr_disable_cmd_tlv(wmi_unified_t wmi_handle) WMI_PDEV_DFS_DISABLE_CMDID); if (ret != 0) { - WMI_LOGE("Sending PDEV DFS disable cmd failed"); + wmi_err("Sending PDEV DFS disable cmd failed"); wmi_buf_free(buf); } @@ -6422,7 +6412,7 @@ static QDF_STATUS send_phyerr_enable_cmd_tlv(wmi_unified_t wmi_handle) WMI_PDEV_DFS_ENABLE_CMDID); if (ret != 0) { - WMI_LOGE("Sending PDEV DFS enable cmd failed"); + wmi_err("Sending PDEV DFS enable cmd failed"); wmi_buf_free(buf); } @@ -6469,7 +6459,7 @@ send_periodic_chan_stats_config_cmd_tlv(wmi_unified_t wmi_handle, WMI_SET_PERIODIC_CHANNEL_STATS_CONFIG_CMDID); if (ret != 0) { - WMI_LOGE("Sending periodic chan stats config failed"); + wmi_err("Sending periodic chan stats config failed"); wmi_buf_free(buf); } @@ -6535,7 +6525,7 @@ static QDF_STATUS send_simulation_test_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, wmi_buf_len, WMI_SIMULATION_TEST_CMDID)) { - WMI_LOGE("%s: Failed to send test simulation cmd", __func__); + wmi_err("Failed to send test simulation cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6602,7 +6592,7 @@ static QDF_STATUS send_vdev_spectral_configure_cmd_tlv(wmi_unified_t wmi_handle, WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID); if (ret != 0) { - WMI_LOGE("Sending set quiet cmd failed"); + wmi_err("Sending set quiet cmd failed"); wmi_buf_free(buf); } @@ -6689,7 +6679,7 @@ static QDF_STATUS send_vdev_spectral_enable_cmd_tlv(wmi_unified_t wmi_handle, WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID); if (ret != 0) { - WMI_LOGE("Sending scan enable CMD failed"); + wmi_err("Sending scan enable CMD failed"); wmi_buf_free(buf); } @@ -6709,17 +6699,17 @@ extract_pdev_sscan_fw_cmd_fixed_param_tlv( wmi_pdev_sscan_fw_cmd_fixed_param *ev; if (!wmi_handle) { - WMI_LOGE("WMI handle is null"); + wmi_err("WMI handle is null"); return QDF_STATUS_E_INVAL; } if (!event) { - WMI_LOGE("WMI event is null"); + wmi_err("WMI event is null"); return QDF_STATUS_E_INVAL; } if (!param) { - WMI_LOGE("Spectral startscan response params is null"); + wmi_err("Spectral startscan response params is null"); return QDF_STATUS_E_INVAL; } @@ -6861,7 +6851,7 @@ static QDF_STATUS send_thermal_mitigation_param_cmd_tlv( WMI_THERM_THROT_SET_CONF_CMDID); if (QDF_IS_STATUS_ERROR(error)) { wmi_buf_free(buf); - WMI_LOGE("Failed to send WMI_THERM_THROT_SET_CONF_CMDID command"); + wmi_err("Failed to send WMI_THERM_THROT_SET_CONF_CMDID command"); } return error; @@ -6908,7 +6898,7 @@ send_coex_config_cmd_tlv(wmi_unified_t wmi_handle, WMI_COEX_CONFIG_CMDID); if (ret != 0) { - WMI_LOGE("Sending COEX CONFIG CMD failed"); + wmi_err("Sending COEX CONFIG CMD failed"); wmi_buf_free(buf); } @@ -7295,7 +7285,7 @@ static QDF_STATUS send_cfg_action_frm_tb_ppdu_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_HE_TB_ACTION_FRM_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE(FL("HE TB action frame cmnd send fail, ret %d"), ret); + wmi_err("HE TB action frame cmnd send fail, ret %d", ret); wmi_buf_free(buf); } @@ -7407,7 +7397,7 @@ static QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID_param_tlvs *) event; if (!param_buf) { - WMI_LOGE("Invalid log supported event buffer"); + wmi_err("Invalid log supported event buffer"); return QDF_STATUS_E_INVAL; } wmi_event = param_buf->fixed_param; @@ -7415,7 +7405,7 @@ static QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle, if (num_of_diag_events_logs > param_buf->num_diag_events_logs_list) { - WMI_LOGE("message number of events %d is more than tlv hdr content %d", + wmi_err("message number of events %d is more than tlv hdr content %d", num_of_diag_events_logs, param_buf->num_diag_events_logs_list); return QDF_STATUS_E_INVAL; @@ -7423,8 +7413,8 @@ static QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle, evt_args = param_buf->diag_events_logs_list; if (!evt_args) { - WMI_LOGE("%s: Event list is empty, num_of_diag_events_logs=%d", - __func__, num_of_diag_events_logs); + wmi_err("Event list is empty, num_of_diag_events_logs=%d", + num_of_diag_events_logs); return QDF_STATUS_E_INVAL; } @@ -7439,8 +7429,7 @@ static QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle, if (num_of_diag_events_logs > (WMI_SVC_MSG_MAX_SIZE / sizeof(uint32_t))) { - WMI_LOGE("%s: excess num of logs:%d", __func__, - num_of_diag_events_logs); + wmi_err("excess num of logs: %d", num_of_diag_events_logs); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } @@ -7500,8 +7489,7 @@ static QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_DIAG_EVENT_LOG_CONFIG_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, buf_len, WMI_DIAG_EVENT_LOG_CONFIG_CMDID)) { - WMI_LOGE("%s: WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed", - __func__); + wmi_err("WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed"); wmi_buf_free(buf); /* Not clearing events_logs_list, though wmi cmd failed. * Host can still have this list @@ -7597,8 +7585,7 @@ static QDF_STATUS send_enable_specific_fw_logs_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_DIAG_EVENT_LOG_CONFIG_CMDID, NO_SESSION, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_DIAG_EVENT_LOG_CONFIG_CMDID)) { - WMI_LOGE("%s: WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed", - __func__); + wmi_err("WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed"); wmi_buf_free(buf); return QDF_STATUS_E_INVAL; } @@ -7639,7 +7626,7 @@ static QDF_STATUS send_flush_logs_to_fw_cmd_tlv(wmi_unified_t wmi_handle) len, WMI_DEBUG_MESG_FLUSH_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send WMI_DEBUG_MESG_FLUSH_CMDID"); + wmi_err("Failed to send WMI_DEBUG_MESG_FLUSH_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_INVAL; } @@ -7830,7 +7817,7 @@ send_encrypt_decrypt_send_cmd_tlv(wmi_unified_t wmi_handle, wmi_buf, len, WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send ENCRYPT DECRYPT cmd: %d", ret); + wmi_err("Failed to send ENCRYPT DECRYPT cmd: %d", ret); wmi_buf_free(wmi_buf); } @@ -7956,7 +7943,7 @@ send_wlan_profile_enable_cmd_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_wlan_profile_enable_profile_id_cmd_fixed_param); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("Failed to send WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID"); + wmi_err("Failed to send WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID"); return QDF_STATUS_E_NOMEM; } @@ -7975,7 +7962,7 @@ send_wlan_profile_enable_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID); if (ret) { - WMI_LOGE("Failed to send PROFILE_ENABLE_PROFILE_ID_CMDID"); + wmi_err("Failed to send PROFILE_ENABLE_PROFILE_ID_CMDID"); wmi_buf_free(buf); } return ret; @@ -8001,7 +7988,7 @@ send_wlan_profile_trigger_cmd_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_wlan_profile_trigger_cmd_fixed_param); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("Failed to send WMI_WLAN_PROFILE_TRIGGER_CMDID"); + wmi_err("Failed to send WMI_WLAN_PROFILE_TRIGGER_CMDID"); return QDF_STATUS_E_NOMEM; } @@ -8019,7 +8006,7 @@ send_wlan_profile_trigger_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_TRIGGER_CMDID); if (ret) { - WMI_LOGE("Failed to send WMI_WLAN_PROFILE_TRIGGER_CMDID"); + wmi_err("Failed to send WMI_WLAN_PROFILE_TRIGGER_CMDID"); wmi_buf_free(buf); } return ret; @@ -8045,7 +8032,7 @@ send_wlan_profile_hist_intvl_cmd_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_wlan_profile_set_hist_intvl_cmd_fixed_param); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("Failed to send WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID"); + wmi_err("Failed to send WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID"); return QDF_STATUS_E_NOMEM; } @@ -8066,7 +8053,7 @@ send_wlan_profile_hist_intvl_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID); if (ret) { - WMI_LOGE("Failed to send PROFILE_SET_HIST_INTVL_CMDID"); + wmi_err("Failed to send PROFILE_SET_HIST_INTVL_CMDID"); wmi_buf_free(buf); } return ret; @@ -8225,7 +8212,7 @@ static QDF_STATUS send_power_dbg_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_WAL_POWER_DEBUG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("wmi_unified_cmd_send WMI_PDEV_WAL_POWER_DEBUG_CMDID returned Error %d", + wmi_err("wmi_unified_cmd_send WMI_PDEV_WAL_POWER_DEBUG_CMDID returned Error %d", status); goto error; } @@ -8277,8 +8264,8 @@ static QDF_STATUS send_dfs_phyerr_offload_en_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d, pdev_id=%d", - __func__, ret, pdev_id); + wmi_err("Failed to send cmd to fw, ret=%d, pdev_id=%d", + ret, pdev_id); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8326,8 +8313,8 @@ static QDF_STATUS send_dfs_phyerr_offload_dis_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_DFS_PHYERR_OFFLOAD_DISABLE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d, pdev_id=%d", - __func__, ret, pdev_id); + wmi_err("Failed to send cmd to fw, ret=%d, pdev_id=%d", + ret, pdev_id); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8350,7 +8337,7 @@ QDF_STATUS send_adfs_ch_cfg_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s : wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -8379,8 +8366,7 @@ QDF_STATUS send_adfs_ch_cfg_cmd_tlv(wmi_unified_t wmi_handle, WMI_VDEV_ADFS_CH_CFG_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d", - __func__, ret); + wmi_err("Failed to send cmd to fw, ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8402,7 +8388,7 @@ QDF_STATUS send_adfs_ocac_abort_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s : wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } @@ -8422,8 +8408,7 @@ QDF_STATUS send_adfs_ocac_abort_cmd_tlv(wmi_unified_t wmi_handle, WMI_VDEV_ADFS_OCAC_ABORT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d", - __func__, ret); + wmi_err("Failed to send cmd to fw, ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8445,12 +8430,12 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle, struct wmi_soc *soc = wmi_handle->soc; if (!soc->wmi_service_bitmap) { - WMI_LOGE("WMI service bit map is not saved yet"); + wmi_err("WMI service bit map is not saved yet"); return false; } if (!soc->wmi_ext_service_bitmap) { - WMI_LOGE("WMI service ext bit map is not saved yet"); + wmi_err("WMI service ext bit map is not saved yet"); return false; } @@ -8464,7 +8449,7 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle, service_id); if (service_id >= WMI_MAX_EXT_SERVICE) { - WMI_LOGE("Service id %d but WMI ext2 service bitmap is NULL", + wmi_err("Service id %d but WMI ext2 service bitmap is NULL", service_id); return false; } @@ -8477,7 +8462,7 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle, service_id); if (service_id >= WMI_MAX_SERVICE) { - WMI_LOGE("Service id %d but WMI ext service bitmap is NULL", + wmi_err("Service id %d but WMI ext service bitmap is NULL", service_id); return false; } @@ -8571,7 +8556,7 @@ static QDF_STATUS init_cmd_send_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_INIT_CMDID, NO_SESSION, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_INIT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("wmi_unified_cmd_send WMI_INIT_CMDID returned Error %d", + wmi_err("wmi_unified_cmd_send WMI_INIT_CMDID returned Error %d", ret); wmi_buf_free(buf); } @@ -8619,7 +8604,7 @@ send_addba_send_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_ADDBA_SEND_CMDID, cmd->vdev_id, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_ADDBA_SEND_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d", __func__, ret); + wmi_err("Failed to send cmd to fw, ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8667,7 +8652,7 @@ send_delba_send_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_DELBA_SEND_CMDID, cmd->vdev_id, 0); ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_DELBA_SEND_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d", __func__, ret); + wmi_err("Failed to send cmd to fw, ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8712,7 +8697,7 @@ send_addba_clearresponse_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_ADDBA_CLEAR_RESP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("%s: Failed to send cmd to fw, ret=%d", __func__, ret); + wmi_err("Failed to send cmd to fw, ret=%d", ret); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -8806,7 +8791,7 @@ QDF_STATUS send_obss_spatial_reuse_set_cmd_tlv(wmi_unified_t wmi_handle, WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -8860,7 +8845,7 @@ send_self_srg_bss_color_bitmap_set_cmd_tlv( WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -8915,7 +8900,7 @@ send_self_srg_partial_bssid_bitmap_set_cmd_tlv( WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -8969,7 +8954,7 @@ send_self_srg_obss_color_enable_bitmap_cmd_tlv( WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -9023,7 +9008,7 @@ send_self_srg_obss_bssid_enable_bitmap_cmd_tlv( WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -9077,7 +9062,7 @@ send_self_non_srg_obss_color_enable_bitmap_cmd_tlv( WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -9131,7 +9116,7 @@ send_self_non_srg_obss_bssid_enable_bitmap_cmd_tlv( WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -9174,7 +9159,7 @@ QDF_STATUS send_injector_config_cmd_tlv(wmi_unified_t wmi_handle, WMI_PDEV_FRAME_INJECT_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE( + wmi_err( "WMI_PDEV_FRAME_INJECT_CMDID send returned Error %d", ret); wmi_buf_free(buf); @@ -9229,7 +9214,7 @@ static QDF_STATUS extract_ctl_failsafe_check_ev_param_tlv( param_buf = (WMI_PDEV_CTL_FAILSAFE_CHECK_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid ctl_failsafe event buffer"); + wmi_err("Invalid ctl_failsafe event buffer"); return QDF_STATUS_E_INVAL; } @@ -9594,7 +9579,7 @@ static QDF_STATUS extract_hal_reg_cap_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_SERVICE_READY_EVENTID_param_tlvs *) evt_buf; if (!param_buf || !param_buf->hal_reg_capabilities) { - WMI_LOGE("%s: Invalid arguments", __func__); + wmi_err("Invalid arguments"); return QDF_STATUS_E_FAILURE; } qdf_mem_copy(cap, (((uint8_t *)param_buf->hal_reg_capabilities) + @@ -9623,7 +9608,7 @@ static QDF_STATUS extract_hal_reg_cap_ext2_tlv( WMI_HAL_REG_CAPABILITIES_EXT2 *reg_caps; if (!evt_buf) { - WMI_LOGE("null evt_buf"); + wmi_err("null evt_buf"); return QDF_STATUS_E_INVAL; } @@ -9666,7 +9651,7 @@ static uint32_t extract_num_mem_reqs_tlv(wmi_unified_t wmi_handle, } if (ev->num_mem_reqs > param_buf->num_mem_reqs) { - WMI_LOGE("Invalid num_mem_reqs %d:%d", + wmi_err("Invalid num_mem_reqs %d:%d", ev->num_mem_reqs, param_buf->num_mem_reqs); return 0; } @@ -9931,19 +9916,18 @@ static QDF_STATUS extract_mgmt_rx_params_tlv(wmi_unified_t wmi_handle, param_tlvs = (WMI_MGMT_RX_EVENTID_param_tlvs *) evt_buf; if (!param_tlvs) { - WMI_LOGE("Get NULL point message from FW"); + wmi_err("Get NULL point message from FW"); return QDF_STATUS_E_INVAL; } ev_hdr = param_tlvs->hdr; if (!hdr) { - WMI_LOGE("Rx event is NULL"); + wmi_err("Rx event is NULL"); return QDF_STATUS_E_INVAL; } if (IS_WMI_RX_MGMT_FRAME_STATUS_INVALID(ev_hdr->status)) { - WMI_LOGE("%s: RX mgmt frame decrypt error, discard it", - __func__); + wmi_err("RX mgmt frame decrypt error, discard it"); return QDF_STATUS_E_INVAL; } @@ -9984,7 +9968,7 @@ static QDF_STATUS extract_vdev_roam_param_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_ROAM_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - WMI_LOGE("Invalid roam event buffer"); + wmi_err("Invalid roam event buffer"); return QDF_STATUS_E_INVAL; } @@ -10346,7 +10330,7 @@ static QDF_STATUS extract_profile_ctx_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_WLAN_PROFILE_DATA_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid profile data event buf", __func__); + wmi_err("Invalid profile data event buf"); return QDF_STATUS_E_INVAL; } @@ -10380,7 +10364,7 @@ static QDF_STATUS extract_profile_data_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_WLAN_PROFILE_DATA_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid profile data event buf", __func__); + wmi_err("Invalid profile data event buf"); return QDF_STATUS_E_INVAL; } @@ -10421,7 +10405,7 @@ static QDF_STATUS extract_pdev_utf_event_tlv(wmi_unified_t wmi_handle, event->datalen = param_buf->num_data; if (event->datalen < sizeof(struct wmi_host_utf_seg_header_info)) { - WMI_LOGE("%s: Invalid datalen: %d ", __func__, event->datalen); + wmi_err("Invalid datalen: %d", event->datalen); return QDF_STATUS_E_INVAL; } seg_hdr = (struct wmi_host_utf_seg_header_info *)param_buf->data; @@ -10972,7 +10956,7 @@ static QDF_STATUS extract_mac_phy_cap_service_ready_ext2_tlv( WMI_MAC_PHY_CAPABILITIES_EXT *mac_phy_caps; if (!event) { - WMI_LOGE("null evt_buf"); + wmi_err("null evt_buf"); return QDF_STATUS_E_INVAL; } @@ -11062,7 +11046,7 @@ static QDF_STATUS validate_dbr_ring_caps_idx(uint8_t idx, return QDF_STATUS_E_INVAL; } if (idx >= num_dma_ring_caps) { - WMI_LOGE("%s: Index %d exceeds range", __func__, idx); + wmi_err("Index %d exceeds range", idx); return QDF_STATUS_E_INVAL; } return QDF_STATUS_SUCCESS; @@ -11296,7 +11280,7 @@ send_pdev_get_pn_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s:wmi_buf_alloc failed\n", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_FAILURE; } @@ -11312,7 +11296,7 @@ send_pdev_get_pn_cmd_tlv(wmi_unified_t wmi_handle, cmd->key_type = params->key_type; if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PEER_TX_PN_REQUEST_CMDID)) { - WMI_LOGE("%s:Failed to send WMI command\n", __func__); + wmi_err("Failed to send WMI command"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -11397,7 +11381,7 @@ extract_encrypt_decrypt_resp_event_tlv(wmi_unified_t wmi_handle, param_buf = evt_buf; if (!param_buf) { - WMI_LOGE("encrypt decrypt resp evt_buf is NULL"); + wmi_err("encrypt decrypt resp evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -11409,7 +11393,7 @@ extract_encrypt_decrypt_resp_event_tlv(wmi_unified_t wmi_handle, if ((data_event->data_length > param_buf->num_enc80211_frame) || (data_event->data_length > WMI_SVC_MSG_MAX_SIZE - WMI_TLV_HDR_SIZE - sizeof(*data_event))) { - WMI_LOGE("FW msg data_len %d more than TLV hdr %d", + wmi_err("FW msg data_len %d more than TLV hdr %d", data_event->data_length, param_buf->num_enc80211_frame); return QDF_STATUS_E_INVAL; @@ -11551,7 +11535,7 @@ static QDF_STATUS extract_reg_chan_list_update_event_tlv( param_buf = (WMI_REG_CHAN_LIST_CC_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("invalid channel list event buf"); + wmi_err("invalid channel list event buf"); return QDF_STATUS_E_FAILURE; } @@ -11647,7 +11631,7 @@ static QDF_STATUS extract_reg_11d_new_country_event_tlv( param_buf = (WMI_11D_NEW_COUNTRY_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("invalid 11d country event buf"); + wmi_err("invalid 11d country event buf"); return QDF_STATUS_E_FAILURE; } @@ -11674,22 +11658,22 @@ static QDF_STATUS extract_reg_ch_avoid_event_tlv( (WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - WMI_LOGE("Invalid channel avoid event buffer"); + wmi_err("Invalid channel avoid event buffer"); return QDF_STATUS_E_INVAL; } afr_fixed_param = param_buf->fixed_param; if (!afr_fixed_param) { - WMI_LOGE("Invalid channel avoid event fixed param buffer"); + wmi_err("Invalid channel avoid event fixed param buffer"); return QDF_STATUS_E_INVAL; } if (!ch_avoid_ind) { - WMI_LOGE("Invalid channel avoid indication buffer"); + wmi_err("Invalid channel avoid indication buffer"); return QDF_STATUS_E_INVAL; } if (param_buf->num_avd_freq_range < afr_fixed_param->num_freq_ranges) { - WMI_LOGE(FL("no.of freq ranges exceeded the limit")); + wmi_err("no.of freq ranges exceeded the limit"); return QDF_STATUS_E_INVAL; } num_freq_ranges = (afr_fixed_param->num_freq_ranges > @@ -11736,7 +11720,7 @@ static QDF_STATUS extract_dfs_cac_complete_event_tlv(wmi_unified_t wmi_handle, param_tlvs = (WMI_VDEV_DFS_CAC_COMPLETE_EVENTID_param_tlvs *) evt_buf; if (!param_tlvs) { - WMI_LOGE("invalid cac complete event buf"); + wmi_err("invalid cac complete event buf"); return QDF_STATUS_E_FAILURE; } @@ -11766,12 +11750,12 @@ extract_dfs_ocac_complete_event_tlv(wmi_unified_t wmi_handle, param_tlvs = (WMI_VDEV_ADFS_OCAC_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_tlvs) { - WMI_LOGE("invalid ocac complete event buf"); + wmi_err("invalid ocac complete event buf"); return QDF_STATUS_E_FAILURE; } if (!param_tlvs->fixed_param) { - WMI_LOGE("invalid param_tlvs->fixed_param"); + wmi_err("invalid param_tlvs->fixed_param"); return QDF_STATUS_E_FAILURE; } @@ -11813,7 +11797,7 @@ static QDF_STATUS extract_dfs_radar_detection_event_tlv( param_tlv = (WMI_PDEV_DFS_RADAR_DETECTION_EVENTID_param_tlvs *) evt_buf; if (!param_tlv) { - WMI_LOGE("invalid radar detection event buf"); + wmi_err("invalid radar detection event buf"); return QDF_STATUS_E_FAILURE; } @@ -11872,7 +11856,7 @@ static QDF_STATUS extract_wlan_radar_event_info_tlv( param_tlv = (WMI_DFS_RADAR_EVENTID_param_tlvs *)evt_buf; if (!param_tlv) { - WMI_LOGE("invalid wlan radar event buf"); + wmi_err("invalid wlan radar event buf"); return QDF_STATUS_E_FAILURE; } @@ -11970,8 +11954,7 @@ static QDF_STATUS send_get_rcpi_cmd_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_RCPI_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_REQUEST_RCPI_CMDID", - __func__); + wmi_err("Failed to send WMI_REQUEST_RCPI_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -11997,7 +11980,7 @@ extract_rcpi_response_event_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_UPDATE_RCPI_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE(FL("Invalid rcpi event")); + wmi_err("Invalid rcpi event"); return QDF_STATUS_E_INVAL; } @@ -12024,7 +12007,7 @@ extract_rcpi_response_event_tlv(wmi_unified_t wmi_handle, break; default: - WMI_LOGE(FL("Invalid rcpi measurement type from firmware")); + wmi_err("Invalid rcpi measurement type from firmware"); res->measurement_type = RCPI_MEASUREMENT_TYPE_INVALID; return QDF_STATUS_E_FAILURE; } @@ -12139,7 +12122,7 @@ static QDF_STATUS send_set_country_cmd_tlv(wmi_unified_t wmi_handle, buf, len, WMI_SET_CURRENT_COUNTRY_CMDID); if (QDF_IS_STATUS_ERROR(qdf_status)) { - WMI_LOGE("Failed to send WMI_SET_CURRENT_COUNTRY_CMDID"); + wmi_err("Failed to send WMI_SET_CURRENT_COUNTRY_CMDID"); wmi_buf_free(buf); } @@ -12194,7 +12177,7 @@ static QDF_STATUS send_user_country_code_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SET_INIT_COUNTRY_CMDID); if (ret) { - WMI_LOGE("Failed to config wow wakeup event"); + wmi_err("Failed to config wow wakeup event"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12242,7 +12225,7 @@ static QDF_STATUS send_obss_detection_cfg_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_SAP_OBSS_DETECTION_CFG_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_SAP_OBSS_DETECTION_CFG_CMDID)) { - WMI_LOGE("Failed to send WMI_SAP_OBSS_DETECTION_CFG_CMDID"); + wmi_err("Failed to send WMI_SAP_OBSS_DETECTION_CFG_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12266,13 +12249,13 @@ static QDF_STATUS extract_obss_detection_info_tlv(uint8_t *evt_buf, wmi_sap_obss_detection_info_evt_fixed_param *fix_param; if (!obss_detection) { - WMI_LOGE("%s: Invalid obss_detection event buffer", __func__); + wmi_err("Invalid obss_detection event buffer"); return QDF_STATUS_E_INVAL; } param_buf = (WMI_SAP_OBSS_DETECTION_REPORT_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid evt_buf", __func__); + wmi_err("Invalid evt_buf"); return QDF_STATUS_E_INVAL; } @@ -12293,7 +12276,7 @@ static QDF_STATUS extract_obss_detection_info_tlv(uint8_t *evt_buf, obss_detection->reason = OBSS_OFFLOAD_DETECTION_ABSENT; break; default: - WMI_LOGE("%s: Invalid reason %d", __func__, fix_param->reason); + wmi_err("Invalid reason: %d", fix_param->reason); return QDF_STATUS_E_INVAL; } @@ -12333,8 +12316,7 @@ send_roam_scan_stats_cmd_tlv(wmi_unified_t wmi_handle, WMI_LOGD(FL("Roam Scan Stats Req vdev_id: %u"), cmd->vdev_id); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_REQUEST_ROAM_SCAN_STATS_CMDID)) { - WMI_LOGE("%s: Failed to send WMI_REQUEST_ROAM_SCAN_STATS_CMDID", - __func__); + wmi_err("Failed to send WMI_REQUEST_ROAM_SCAN_STATS_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12360,7 +12342,7 @@ static QDF_STATUS send_roam_scan_ch_list_req_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed to allocate wmi buffer", __func__); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -12375,7 +12357,7 @@ static QDF_STATUS send_roam_scan_ch_list_req_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_ROAM_GET_SCAN_CHANNEL_LIST_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send get roam scan channels request = %d", + wmi_err("Failed to send get roam scan channels request = %d", ret); wmi_buf_free(buf); } @@ -12421,7 +12403,7 @@ extract_roam_scan_stats_res_evt_tlv(wmi_unified_t wmi_handle, void *evt_buf, *vdev_id = 0xFF; /* Initialize to invalid vdev id */ param_buf = (WMI_ROAM_SCAN_STATS_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE(FL("Invalid roam scan stats event")); + wmi_err("Invalid roam scan stats event"); return QDF_STATUS_E_INVAL; } @@ -12609,7 +12591,7 @@ static QDF_STATUS extract_offload_bcn_tx_status_evt(wmi_unified_t wmi_handle, param_buf = (WMI_OFFLOAD_BCN_TX_STATUS_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid offload bcn tx status event buffer"); + wmi_err("Invalid offload bcn tx status event buffer"); return QDF_STATUS_E_INVAL; } @@ -12631,7 +12613,7 @@ static QDF_STATUS extract_green_ap_egap_status_info_tlv( param_buf = (WMI_AP_PS_EGAP_INFO_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid EGAP Info status event buffer"); + wmi_err("Invalid EGAP Info status event buffer"); return QDF_STATUS_E_INVAL; } @@ -12641,7 +12623,7 @@ static QDF_STATUS extract_green_ap_egap_status_info_tlv( param_buf->chainmask_list; if (!egap_info_event || !chainmask_event) { - WMI_LOGE("Invalid EGAP Info event or chainmask event"); + wmi_err("Invalid EGAP Info event or chainmask event"); return QDF_STATUS_E_INVAL; } @@ -12806,7 +12788,7 @@ extract_esp_estimation_ev_param_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_ESP_ESTIMATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid ESP Estimate Event buffer"); + wmi_err("Invalid ESP Estimate Event buffer"); return QDF_STATUS_E_INVAL; } esp_event = param_buf->fixed_param; @@ -12855,7 +12837,7 @@ static QDF_STATUS send_bss_color_change_enable_cmd_tlv(wmi_unified_t wmi_handle, wmi_mtrace(WMI_BSS_COLOR_CHANGE_ENABLE_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_BSS_COLOR_CHANGE_ENABLE_CMDID)) { - WMI_LOGE("Failed to send WMI_BSS_COLOR_CHANGE_ENABLE_CMDID"); + wmi_err("Failed to send WMI_BSS_COLOR_CHANGE_ENABLE_CMDID"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12912,8 +12894,7 @@ static QDF_STATUS send_obss_color_collision_cfg_cmd_tlv( cmd->evt_type = WMI_BSS_COLOR_FREE_SLOT_AVAILABLE; break; default: - WMI_LOGE("%s: invalid event type: %d", - __func__, cfg_param->evt_type); + wmi_err("Invalid event type: %d", cfg_param->evt_type); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12928,8 +12909,8 @@ static QDF_STATUS send_obss_color_collision_cfg_cmd_tlv( wmi_mtrace(WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID)) { - WMI_LOGE("%s: Sending OBSS color det cmd failed, vdev_id: %d", - __func__, cfg_param->vdev_id); + wmi_err("Sending OBSS color det cmd failed, vdev_id: %d", + cfg_param->vdev_id); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -12952,14 +12933,14 @@ static QDF_STATUS extract_obss_color_collision_info_tlv(uint8_t *evt_buf, wmi_obss_color_collision_evt_fixed_param *fix_param; if (!info) { - WMI_LOGE("%s: Invalid obss color buffer", __func__); + wmi_err("Invalid obss color buffer"); return QDF_STATUS_E_INVAL; } param_buf = (WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid evt_buf", __func__); + wmi_err("Invalid evt_buf"); return QDF_STATUS_E_INVAL; } @@ -12984,8 +12965,8 @@ static QDF_STATUS extract_obss_color_collision_info_tlv(uint8_t *evt_buf, info->evt_type = OBSS_COLOR_FREE_SLOT_AVAILABLE; break; default: - WMI_LOGE("%s: invalid event type: %d, vdev_id: %d", - __func__, fix_param->evt_type, fix_param->vdev_id); + wmi_err("Invalid event type: %d, vdev_id: %d", + fix_param->evt_type, fix_param->vdev_id); return QDF_STATUS_E_FAILURE; } @@ -13030,8 +13011,7 @@ send_vdev_fils_enable_cmd_send(struct wmi_unified *wmi_handle, wmi_mtrace(WMI_ENABLE_FILS_CMDID, cmd->vdev_id, cmd->fd_period); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_ENABLE_FILS_CMDID)) { - WMI_LOGE("%s: Sending FILS cmd failed, vdev_id: %d", - __func__, param->vdev_id); + wmi_err("Sending FILS cmd failed, vdev_id: %d", param->vdev_id); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -13063,7 +13043,7 @@ static QDF_STATUS send_mws_coex_status_req_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s: Failed to allocate wmi buffer", __func__); + wmi_err("Failed to allocate wmi buffer"); return QDF_STATUS_E_NOMEM; } @@ -13078,7 +13058,7 @@ static QDF_STATUS send_mws_coex_status_req_cmd_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_GET_MWS_COEX_INFO_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("Failed to send set param command ret = %d", ret); + wmi_err("Failed to send set param command ret = %d", ret); wmi_buf_free(buf); } return ret; @@ -13103,7 +13083,7 @@ extract_oem_response_param_tlv(wmi_unified_t wmi_handle, void *resp_buf, (WMI_OEM_RESPONSE_EVENTID_param_tlvs *)resp_buf; if (!param_buf) { - WMI_LOGE("Invalid OEM response"); + wmi_err("Invalid OEM response"); return QDF_STATUS_E_INVAL; } @@ -13149,13 +13129,13 @@ extract_hw_mode_resp_event_status_tlv(wmi_unified_t wmi_handle, void *evt_buf, param_buf = (WMI_PDEV_SET_HW_MODE_RESP_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid mode change event buffer"); + wmi_err("Invalid mode change event buffer"); return QDF_STATUS_E_INVAL; } fixed_param = param_buf->fixed_param; if (!fixed_param) { - WMI_LOGE("Invalid fixed param"); + wmi_err("Invalid fixed param"); return QDF_STATUS_E_INVAL; } @@ -13204,7 +13184,7 @@ static QDF_STATUS send_ani_level_cmd_tlv(wmi_unified_t wmi_handle, WMI_GET_CHANNEL_ANI_CMDID); if (QDF_IS_STATUS_ERROR(ret)) { - WMI_LOGE("WMI_GET_CHANNEL_ANI_CMDID send error %d", ret); + wmi_err("WMI_GET_CHANNEL_ANI_CMDID send error %d", ret); wmi_buf_free(buf); } @@ -13464,7 +13444,7 @@ extract_roam_scan_stats_tlv(wmi_unified_t wmi_handle, void *evt_buf, status = extract_roam_scan_ap_stats_tlv(wmi_handle, evt_buf, dst->ap, ap_idx, dst->num_ap); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Extract candidate stats for tlv[%d] failed", idx); + wmi_err("Extract candidate stats for tlv[%d] failed", idx); return status; } @@ -13658,7 +13638,7 @@ static QDF_STATUS send_wlan_ts_ftm_trigger_cmd_tlv(wmi_unified_t wmi, cmd->vdev_id = vdev_id; cmd->agg_relation = burst_mode ? false : true; if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID)) { - WMI_LOGE("%s: failed to send audio sync trigger cmd", __func__); + wmi_err("Failed to send audio sync trigger cmd"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -13705,13 +13685,13 @@ static QDF_STATUS extract_time_sync_ftm_start_stop_event_tlv( param_buf = (WMI_VDEV_AUDIO_SYNC_START_STOP_EVENTID_param_tlvs *)buf; if (!param_buf) { - WMI_LOGE("Invalid audio sync start stop event buffer"); + wmi_err("Invalid audio sync start stop event buffer"); return QDF_STATUS_E_FAILURE; } resp_event = param_buf->fixed_param; if (!resp_event) { - WMI_LOGE("Invalid audio sync start stop fixed param buffer"); + wmi_err("Invalid audio sync start stop fixed param buffer"); return QDF_STATUS_E_FAILURE; } @@ -13741,13 +13721,13 @@ extract_time_sync_ftm_offset_event_tlv(wmi_unified_t wmi, void *buf, param_buf = (WMI_VDEV_AUDIO_SYNC_Q_MASTER_SLAVE_OFFSET_EVENTID_param_tlvs *)buf; if (!param_buf) { - WMI_LOGE("Invalid timesync ftm offset event buffer"); + wmi_err("Invalid timesync ftm offset event buffer"); return QDF_STATUS_E_FAILURE; } resp_event = param_buf->fixed_param; if (!resp_event) { - WMI_LOGE("Invalid timesync ftm offset fixed param buffer"); + wmi_err("Invalid timesync ftm offset fixed param buffer"); return QDF_STATUS_E_FAILURE; } @@ -13755,7 +13735,7 @@ extract_time_sync_ftm_offset_event_tlv(wmi_unified_t wmi, void *buf, param->num_qtime = param_buf->num_audio_sync_q_master_slave_times; q_pair = param_buf->audio_sync_q_master_slave_times; if (!q_pair) { - WMI_LOGE("Invalid q_master_slave_times buffer"); + wmi_err("Invalid q_master_slave_times buffer"); return QDF_STATUS_E_FAILURE; } diff --git a/wmi/src/wmi_unified_twt_tlv.c b/wmi/src/wmi_unified_twt_tlv.c index 0eda484a90..0a987a1adb 100644 --- a/wmi/src/wmi_unified_twt_tlv.c +++ b/wmi/src/wmi_unified_twt_tlv.c @@ -31,7 +31,7 @@ static QDF_STATUS send_twt_enable_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -67,7 +67,7 @@ static QDF_STATUS send_twt_enable_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_ENABLE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_ENABLE_CMDID"); + wmi_err("Failed to send WMI_TWT_ENABLE_CMDID"); wmi_buf_free(buf); } @@ -84,7 +84,7 @@ static QDF_STATUS send_twt_disable_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -102,7 +102,7 @@ static QDF_STATUS send_twt_disable_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_DISABLE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_DISABLE_CMDID"); + wmi_err("Failed to send WMI_TWT_DISABLE_CMDID"); wmi_buf_free(buf); } @@ -139,7 +139,7 @@ send_twt_add_dialog_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -167,7 +167,7 @@ send_twt_add_dialog_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_ADD_DIALOG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_ADD_DIALOG_CMDID"); + wmi_err("Failed to send WMI_TWT_ADD_DIALOG_CMDID"); wmi_buf_free(buf); } @@ -201,7 +201,7 @@ send_twt_del_dialog_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -220,7 +220,7 @@ send_twt_del_dialog_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_DEL_DIALOG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_DEL_DIALOG_CMDID"); + wmi_err("Failed to send WMI_TWT_DEL_DIALOG_CMDID"); wmi_buf_free(buf); } @@ -237,7 +237,7 @@ send_twt_pause_dialog_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -254,7 +254,7 @@ send_twt_pause_dialog_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_PAUSE_DIALOG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_PAUSE_DIALOG_CMDID"); + wmi_err("Failed to send WMI_TWT_PAUSE_DIALOG_CMDID"); wmi_buf_free(buf); } @@ -270,7 +270,7 @@ static QDF_STATUS send_twt_resume_dialog_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -289,7 +289,7 @@ static QDF_STATUS send_twt_resume_dialog_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_TWT_RESUME_DIALOG_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_TWT_RESUME_DIALOG_CMDID"); + wmi_err("Failed to send WMI_TWT_RESUME_DIALOG_CMDID"); wmi_buf_free(buf); } @@ -308,7 +308,7 @@ send_twt_btwt_invite_sta_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -342,7 +342,7 @@ send_twt_btwt_remove_sta_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - WMI_LOGE("Failed to allocate memory"); + wmi_err("Failed to allocate memory"); return QDF_STATUS_E_FAILURE; } @@ -375,7 +375,7 @@ static QDF_STATUS extract_twt_enable_comp_event_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_TWT_ENABLE_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -398,7 +398,7 @@ static QDF_STATUS extract_twt_disable_comp_event_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_TWT_DISABLE_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -432,7 +432,7 @@ static QDF_STATUS extract_twt_add_dialog_comp_event_tlv( param_buf = (WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -472,7 +472,7 @@ static QDF_STATUS extract_twt_add_dialog_comp_additional_parameters param_buf = (WMI_TWT_ADD_DIALOG_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -484,18 +484,18 @@ static QDF_STATUS extract_twt_add_dialog_comp_additional_parameters */ if (ev->status != WMI_HOST_ADD_TWT_STATUS_OK && ev->status != WMI_HOST_ADD_TWT_STATUS_DENIED) { - WMI_LOGE("Status of add dialog complete is not success"); + wmi_err("Status of add dialog complete is not success"); return QDF_STATUS_E_INVAL; } if (idx >= param_buf->num_twt_params) { - WMI_LOGE("Invalid idx %d while num_twt_params = %d", + wmi_err("Invalid idx %d while num_twt_params = %d", idx, param_buf->num_twt_params); return QDF_STATUS_E_INVAL; } if (!param_buf->twt_params) { - WMI_LOGE("Unable to extract additional twt parameters"); + wmi_err("Unable to extract additional twt parameters"); return QDF_STATUS_E_INVAL; } @@ -504,7 +504,7 @@ static QDF_STATUS extract_twt_add_dialog_comp_additional_parameters sizeof(wmi_twt_add_dialog_additional_params))); if (evt_buf_len != expected_len) { - WMI_LOGE("Got invalid len data from FW %d expected %d", + wmi_err("Got invalid len data from FW %d expected %d", evt_buf_len, expected_len); return QDF_STATUS_E_INVAL; } @@ -541,7 +541,7 @@ static QDF_STATUS extract_twt_del_dialog_comp_event_tlv( param_buf = (WMI_TWT_DEL_DIALOG_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -565,7 +565,7 @@ static QDF_STATUS extract_twt_pause_dialog_comp_event_tlv( param_buf = (WMI_TWT_PAUSE_DIALOG_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -590,7 +590,7 @@ static QDF_STATUS extract_twt_resume_dialog_comp_event_tlv( param_buf = (WMI_TWT_RESUME_DIALOG_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -619,7 +619,7 @@ extract_twt_btwt_invite_sta_comp_event_tlv( param_buf = (WMI_TWT_BTWT_INVITE_STA_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -647,7 +647,7 @@ extract_twt_btwt_remove_sta_comp_event_tlv( param_buf = (WMI_TWT_BTWT_REMOVE_STA_COMPLETE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -695,7 +695,7 @@ extract_twt_session_stats_event_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_TWT_SESSION_STATS_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } @@ -729,12 +729,12 @@ extract_twt_session_stats_event_data(wmi_unified_t wmi_handle, param_buf = (WMI_TWT_SESSION_STATS_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("evt_buf is NULL"); + wmi_err("evt_buf is NULL"); return QDF_STATUS_E_INVAL; } if (idx >= param_buf->num_twt_sessions) { - WMI_LOGE("wrong idx, idx=%d, num_sessions=%d", + wmi_err("wrong idx, idx=%d, num_sessions=%d", idx, param_buf->num_twt_sessions); return QDF_STATUS_E_INVAL; } diff --git a/wmi/src/wmi_unified_vdev_tlv.c b/wmi/src/wmi_unified_vdev_tlv.c index df638569fd..8c5329acf7 100644 --- a/wmi/src/wmi_unified_vdev_tlv.c +++ b/wmi/src/wmi_unified_vdev_tlv.c @@ -33,7 +33,7 @@ send_vdev_config_ratemask_cmd_tlv(struct wmi_unified *wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s:wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_FAILURE; } cmd = (wmi_vdev_config_ratemask_cmd_fixed_param *)wmi_buf_data(buf); @@ -51,7 +51,7 @@ send_vdev_config_ratemask_cmd_tlv(struct wmi_unified *wmi_handle, wmi_mtrace(WMI_VDEV_RATEMASK_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_RATEMASK_CMDID)) { - WMI_LOGE("Seting vdev ratemask failed"); + wmi_err("Setting vdev ratemask failed"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -71,7 +71,7 @@ send_beacon_send_cmd_tlv(struct wmi_unified *wmi_handle, wmi_buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!wmi_buf) { - WMI_LOGE("%s : wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_NOMEM; } if (param->is_dtim_count_zero) { @@ -102,7 +102,7 @@ send_beacon_send_cmd_tlv(struct wmi_unified *wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, wmi_buf, sizeof(*cmd), WMI_PDEV_SEND_BCN_CMDID); if (ret != QDF_STATUS_SUCCESS) { - WMI_LOGE("%s: Failed to send bcn: %d", __func__, ret); + wmi_err("Failed to send bcn: %d", ret); wmi_buf_free(wmi_buf); } @@ -119,7 +119,7 @@ extract_tbttoffset_num_vdevs_tlv(struct wmi_unified *wmi_handle, void *evt_buf, param_buf = (WMI_TBTTOFFSET_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid tbtt update ext event buffer", __func__); + wmi_err("Invalid tbtt update ext event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_event = param_buf->fixed_param; @@ -140,7 +140,7 @@ send_vdev_set_neighbour_rx_cmd_tlv(struct wmi_unified *wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - WMI_LOGE("%s:wmi_buf_alloc failed", __func__); + wmi_err("wmi_buf_alloc failed"); return QDF_STATUS_E_FAILURE; } cmd = (wmi_vdev_filter_nrp_config_cmd_fixed_param *)wmi_buf_data(buf); @@ -158,7 +158,7 @@ send_vdev_set_neighbour_rx_cmd_tlv(struct wmi_unified *wmi_handle, wmi_mtrace(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID, cmd->vdev_id, 0); if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID)) { - WMI_LOGE("Failed to set neighbour rx param"); + wmi_err("Failed to set neighbour rx param"); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -175,13 +175,13 @@ extract_vdev_start_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf, param_buf = (WMI_VDEV_START_RESP_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid start response event buffer", __func__); + wmi_err("Invalid start response event buffer"); return QDF_STATUS_E_INVAL; } ev = param_buf->fixed_param; if (!ev) { - WMI_LOGE("%s: Invalid start response event buffer", __func__); + wmi_err("Invalid start response event buffer"); return QDF_STATUS_E_INVAL; } @@ -197,7 +197,7 @@ extract_vdev_start_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf, vdev_rsp->resp_type = WMI_HOST_VDEV_RESTART_RESP_EVENT; break; default: - WMI_LOGE("Invalid start response event buffer"); + wmi_err("Invalid start response event buffer"); break; }; vdev_rsp->status = ev->status; @@ -220,13 +220,13 @@ extract_vdev_delete_resp_tlv(struct wmi_unified *wmi_handle, void *evt_buf, param_buf = (WMI_VDEV_DELETE_RESP_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid vdev delete response event buffer"); + wmi_err("Invalid vdev delete response event buffer"); return QDF_STATUS_E_INVAL; } ev = param_buf->fixed_param; if (!ev) { - WMI_LOGE("Invalid vdev delete response event"); + wmi_err("Invalid vdev delete response event"); return QDF_STATUS_E_INVAL; } @@ -249,7 +249,7 @@ static QDF_STATUS extract_vdev_peer_delete_all_response_event_tlv( ev = (wmi_vdev_delete_all_peer_resp_event_fixed_param *) param_buf->fixed_param; if (!ev) { - WMI_LOGE("%s: Invalid peer_delete all response", __func__); + wmi_err("Invalid peer_delete all response"); return QDF_STATUS_E_FAILURE; } @@ -268,7 +268,7 @@ extract_vdev_stopped_param_tlv(struct wmi_unified *wmi_handle, param_buf = (WMI_VDEV_STOPPED_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("Invalid event buffer"); + wmi_err("Invalid event buffer"); return QDF_STATUS_E_INVAL; } resp_event = param_buf->fixed_param; @@ -287,7 +287,7 @@ static QDF_STATUS extract_ext_tbttoffset_num_vdevs_tlv( param_buf = (WMI_TBTTOFFSET_EXT_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s Invalid tbtt update ext event buffer", __func__); + wmi_err("Invalid tbtt update ext event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_ext_event = param_buf->fixed_param; @@ -308,7 +308,7 @@ static QDF_STATUS extract_tbttoffset_update_params_tlv( param_buf = (WMI_TBTTOFFSET_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid tbtt update event buffer", __func__); + wmi_err("Invalid tbtt update event buffer"); return QDF_STATUS_E_INVAL; } @@ -339,7 +339,7 @@ static QDF_STATUS extract_ext_tbttoffset_update_params_tlv( param_buf = (WMI_TBTTOFFSET_EXT_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid tbtt update event buffer", __func__); + wmi_err("Invalid tbtt update event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_info = ¶m_buf->tbtt_offset_info[idx]; @@ -362,7 +362,7 @@ static QDF_STATUS extract_muedca_params_tlv(wmi_unified_t wmi_hdl, param_buf = (WMI_MUEDCA_PARAMS_CONFIG_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - WMI_LOGE("%s: Invalid muedca evt buffer", __func__); + wmi_err("Invalid muedca evt buffer"); return QDF_STATUS_E_INVAL; } muedca_param = param_buf->fixed_param;