diff --git a/wmi_unified.c b/wmi_unified.c index 6695f391c0..9127620077 100644 --- a/wmi_unified.c +++ b/wmi_unified.c @@ -400,7 +400,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) cmd_log_buf->size = wmi_log_max_entry; if (!cmd_log_buf->buf) { - qdf_print("no memory for WMI command log buffer..\n"); + qdf_print("no memory for WMI command log buffer.."); return QDF_STATUS_E_NOMEM; } cmd_log_buf->p_buf_tail_idx = &cmd_log_buf->buf_tail_idx; @@ -413,7 +413,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) cmd_tx_cmpl_log_buf->size = wmi_log_max_entry; if (!cmd_tx_cmpl_log_buf->buf) { - qdf_print("no memory for WMI Command Tx Complete log buffer..\n"); + qdf_print("no memory for WMI Command Tx Complete log buffer.."); return QDF_STATUS_E_NOMEM; } cmd_tx_cmpl_log_buf->p_buf_tail_idx = @@ -427,7 +427,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) event_log_buf->size = wmi_log_max_entry; if (!event_log_buf->buf) { - qdf_print("no memory for WMI Event log buffer..\n"); + qdf_print("no memory for WMI Event log buffer.."); return QDF_STATUS_E_NOMEM; } event_log_buf->p_buf_tail_idx = &event_log_buf->buf_tail_idx; @@ -440,7 +440,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) rx_event_log_buf->size = wmi_log_max_entry; if (!rx_event_log_buf->buf) { - qdf_print("no memory for WMI Event Rx log buffer..\n"); + qdf_print("no memory for WMI Event Rx log buffer.."); return QDF_STATUS_E_NOMEM; } rx_event_log_buf->p_buf_tail_idx = &rx_event_log_buf->buf_tail_idx; @@ -453,7 +453,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) mgmt_cmd_log_buf->size = wmi_mgmt_log_max_entry; if (!mgmt_cmd_log_buf->buf) { - qdf_print("no memory for WMI Management Command log buffer..\n"); + qdf_print("no memory for WMI Management Command log buffer.."); return QDF_STATUS_E_NOMEM; } mgmt_cmd_log_buf->p_buf_tail_idx = &mgmt_cmd_log_buf->buf_tail_idx; @@ -468,7 +468,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) mgmt_cmd_tx_cmp_log_buf->size = wmi_mgmt_log_max_entry; if (!mgmt_cmd_tx_cmp_log_buf->buf) { - qdf_print("no memory for WMI Management Command Tx complete log buffer..\n"); + qdf_print("no memory for WMI Management Command Tx complete log buffer.."); return QDF_STATUS_E_NOMEM; } mgmt_cmd_tx_cmp_log_buf->p_buf_tail_idx = @@ -484,7 +484,7 @@ static QDF_STATUS wmi_log_init(struct wmi_unified *wmi_handle) mgmt_event_log_buf->size = wmi_mgmt_log_max_entry; if (!mgmt_event_log_buf->buf) { - qdf_print("no memory for WMI Management Event log buffer..\n"); + qdf_print("no memory for WMI Management Event log buffer.."); return QDF_STATUS_E_NOMEM; } mgmt_event_log_buf->p_buf_tail_idx = &mgmt_event_log_buf->buf_tail_idx; @@ -911,7 +911,7 @@ static int debug_wmi_log_size_show(struct seq_file *m, void *v) \ ret = sscanf(locbuf, "%d", &k); \ if ((ret != 1) || (k != 0)) { \ - qdf_print("Wrong input, echo 0 to clear the wmi buffer\n");\ + qdf_print("Wrong input, echo 0 to clear the wmi buffer");\ return -EINVAL; \ } \ \ @@ -1070,8 +1070,7 @@ static void wmi_debugfs_create(wmi_unified_t wmi_handle, wmi_handle, wmi_debugfs_infos[i].ops); if (!wmi_handle->debugfs_de[i]) { - qdf_print("%s: debug Entry creation failed!\n", - __func__); + qdf_print("debug Entry creation failed!"); goto out; } } @@ -1079,7 +1078,7 @@ static void wmi_debugfs_create(wmi_unified_t wmi_handle, return; out: - qdf_print("%s: debug Entry creation failed!\n", __func__); + qdf_print("debug Entry creation failed!"); wmi_log_buffer_free(wmi_handle); return; } @@ -1127,7 +1126,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) { - qdf_print("error while creating debugfs dir for %s\n", buf); + qdf_print("error while creating debugfs dir for %s", buf); return QDF_STATUS_E_FAILURE; } wmi_debugfs_create(wmi_handle, @@ -1337,7 +1336,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, } if (wmi_handle->wmi_stopinprogress) { QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, - "WMI stop in progress\n"); + "WMI stop in progress"); return QDF_STATUS_E_INVAL; } @@ -1475,19 +1474,22 @@ int wmi_unified_register_event(wmi_unified_t wmi_handle, if (event_id >= wmi_events_max || wmi_handle->wmi_events[event_id] == WMI_EVENT_ID_INVALID) { - qdf_print("%s: Event id %d is unavailable\n", - __func__, event_id); + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, + "%s: Event id %d is unavailable", + __func__, event_id); return QDF_STATUS_E_FAILURE; } evt_id = wmi_handle->wmi_events[event_id]; if (wmi_unified_get_event_handler_ix(wmi_handle, evt_id) != -1) { - qdf_print("%s : event handler already registered 0x%x\n", - __func__, evt_id); + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, + "%s : event handler already registered 0x%x", + __func__, evt_id); return QDF_STATUS_E_FAILURE; } if (soc->max_event_idx == WMI_UNIFIED_MAX_EVENT) { - qdf_print("%s : no more event handlers 0x%x\n", - __func__, evt_id); + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, + "%s : no more event handlers 0x%x", + __func__, evt_id); return QDF_STATUS_E_FAILURE; } idx = soc->max_event_idx; @@ -1522,24 +1524,25 @@ int wmi_unified_register_event_handler(wmi_unified_t wmi_handle, if (event_id >= wmi_events_max || wmi_handle->wmi_events[event_id] == WMI_EVENT_ID_INVALID) { - qdf_print("%s: Event id %d is unavailable\n", - __func__, event_id); + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, + "%s: Event id %d is unavailable", + __func__, event_id); return QDF_STATUS_E_FAILURE; } evt_id = wmi_handle->wmi_events[event_id]; if (wmi_unified_get_event_handler_ix(wmi_handle, evt_id) != -1) { - qdf_print("%s : event handler already registered 0x%x\n", - __func__, evt_id); + qdf_print("event handler already registered 0x%x", + evt_id); return QDF_STATUS_E_FAILURE; } if (soc->max_event_idx == WMI_UNIFIED_MAX_EVENT) { - qdf_print("%s : no more event handlers 0x%x\n", - __func__, evt_id); + qdf_print("no more event handlers 0x%x", + evt_id); return QDF_STATUS_E_FAILURE; } QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - "Registered event handler for event 0x%8x\n", evt_id); + "Registered event handler for event 0x%8x", evt_id); idx = soc->max_event_idx; wmi_handle->event_handler[idx] = handler_func; wmi_handle->event_id[idx] = evt_id; @@ -1568,16 +1571,17 @@ int wmi_unified_unregister_event(wmi_unified_t wmi_handle, if (event_id >= wmi_events_max || wmi_handle->wmi_events[event_id] == WMI_EVENT_ID_INVALID) { - qdf_print("%s: Event id %d is unavailable\n", - __func__, event_id); + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, + "%s: Event id %d is unavailable", + __func__, event_id); return QDF_STATUS_E_FAILURE; } evt_id = wmi_handle->wmi_events[event_id]; idx = wmi_unified_get_event_handler_ix(wmi_handle, evt_id); if (idx == -1) { - qdf_print("%s : event handler is not registered: evt id 0x%x\n", - __func__, evt_id); + qdf_print("event handler is not registered: evt id 0x%x", + evt_id); return QDF_STATUS_E_FAILURE; } wmi_handle->event_handler[idx] = NULL; @@ -1607,16 +1611,16 @@ int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, if (event_id >= wmi_events_max || wmi_handle->wmi_events[event_id] == WMI_EVENT_ID_INVALID) { - qdf_print("%s: Event id %d is unavailable\n", - __func__, event_id); + qdf_print("Event id %d is unavailable", + event_id); return QDF_STATUS_E_FAILURE; } evt_id = wmi_handle->wmi_events[event_id]; idx = wmi_unified_get_event_handler_ix(wmi_handle, evt_id); if (idx == -1) { - qdf_print("%s : event handler is not registered: evt id 0x%x\n", - __func__, evt_id); + qdf_print("event handler is not registered: evt id 0x%x", + evt_id); return QDF_STATUS_E_FAILURE; } wmi_handle->event_handler[idx] = NULL; @@ -1731,8 +1735,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 == NULL) { qdf_print - ("%s :unable to get wmi_handle to Endpoint %d\n", - __func__, htc_packet->Endpoint); + ("unable to get wmi_handle to Endpoint %d\n", + htc_packet->Endpoint); qdf_nbuf_free(evt_buf); return; } @@ -1769,7 +1773,7 @@ static void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet) wmi_process_fw_event_default_ctx (wmi_handle, htc_packet, exec_ctx); } else { - qdf_print("%s :Invalid event context %d\n", __func__, exec_ctx); + qdf_print("Invalid event context %d", exec_ctx); qdf_nbuf_free(evt_buf); } @@ -1824,8 +1828,8 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) &wmi_cmd_struct_ptr); if (tlv_ok_status != 0) { QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, - "%s: Error: id=0x%d, wmitlv check status=%d\n", - __func__, id, tlv_ok_status); + "%s: Error: id=0x%x, wmitlv check status=%d", + __func__, id, tlv_ok_status); goto end; } } @@ -1834,7 +1838,7 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) idx = wmi_unified_get_event_handler_ix(wmi_handle, id); if (idx == A_ERROR) { QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, - "%s : event handler is not registered: event id 0x%x\n", + "%s : event handler is not registered: event id 0x%x", __func__, id); goto end; } @@ -2046,8 +2050,8 @@ void *wmi_unified_get_pdev_handle(struct wmi_soc *soc, uint32_t pdev_idx) (struct wmi_unified *) qdf_mem_malloc( sizeof(struct wmi_unified)); if (wmi_handle == NULL) { - qdf_print("allocation of wmi handle failed %zu\n", - sizeof(struct wmi_unified)); + qdf_print("allocation of wmi handle failed %zu", + sizeof(struct wmi_unified)); return NULL; } wmi_handle->scn_handle = soc->scn_handle; @@ -2124,8 +2128,8 @@ void *wmi_unified_attach(void *scn_handle, soc = (struct wmi_soc *) qdf_mem_malloc(sizeof(struct wmi_soc)); if (soc == NULL) { - qdf_print("Allocation of wmi_soc failed %zu\n", - sizeof(struct wmi_soc)); + qdf_print("Allocation of wmi_soc failed %zu", + sizeof(struct wmi_soc)); return NULL; } @@ -2134,8 +2138,8 @@ void *wmi_unified_attach(void *scn_handle, sizeof(struct wmi_unified)); if (wmi_handle == NULL) { qdf_mem_free(soc); - qdf_print("allocation of wmi handle failed %zu\n", - sizeof(struct wmi_unified)); + qdf_print("allocation of wmi handle failed %zu", + sizeof(struct wmi_unified)); return NULL; } wmi_handle->soc = soc; @@ -2493,7 +2497,7 @@ int wmi_stop(wmi_unified_t wmi_handle) { QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO, - "WMI Stop\n"); + "WMI Stop"); wmi_handle->wmi_stopinprogress = 1; return 0; } diff --git a/wmi_unified_non_tlv.c b/wmi_unified_non_tlv.c index d7ec871fdc..0824c3906d 100644 --- a/wmi_unified_non_tlv.c +++ b/wmi_unified_non_tlv.c @@ -53,7 +53,7 @@ static QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_create_cmd *)wmi_buf_data(buf); @@ -61,11 +61,10 @@ static QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle, cmd->vdev_type = param->type; cmd->vdev_subtype = param->subtype; WMI_CHAR_ARRAY_TO_MAC_ADDR(macaddr, &cmd->vdev_macaddr); - qdf_print("%s: ID = %d Type = %d, Subtype = %d " - "VAP Addr = %02x:%02x:%02x:%02x:%02x:%02x:\n", - __func__, param->if_id, param->type, param->subtype, - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); + qdf_print("%s: ID = %d Type = %d, Subtype = %d VAP Addr = %02x:%02x:%02x:%02x:%02x:%02x:", + __func__, param->if_id, param->type, param->subtype, + macaddr[0], macaddr[1], macaddr[2], + macaddr[3], macaddr[4], macaddr[5]); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_CREATE_CMDID); } @@ -86,12 +85,12 @@ static QDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_delete_cmd *)wmi_buf_data(buf); cmd->vdev_id = if_id; - qdf_print("%s for vap %d (%pK)\n", __func__, if_id, wmi_handle); + qdf_print("%s for vap %d (%pK)", __func__, if_id, wmi_handle); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_DELETE_CMDID); } @@ -112,7 +111,7 @@ static QDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi, buf = wmi_buf_alloc(wmi, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_stop_cmd *)wmi_buf_data(buf); @@ -137,12 +136,12 @@ static QDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_down_cmd *)wmi_buf_data(buf); cmd->vdev_id = vdev_id; - qdf_print("%s for vap %d (%pK)\n", __func__, vdev_id, wmi_handle); + qdf_print("%s for vap %d (%pK)", __func__, vdev_id, wmi_handle); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_DOWN_CMDID); } @@ -163,7 +162,7 @@ static QDF_STATUS send_vdev_start_cmd_non_tlv(wmi_unified_t wmi, buf = wmi_buf_alloc(wmi, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -200,11 +199,11 @@ static QDF_STATUS send_vdev_start_cmd_non_tlv(wmi_unified_t wmi, WMI_SET_CHANNEL_FLAG(&cmd->chan, WMI_CHAN_FLAG_QUARTER); if (param->is_restart) { - qdf_print("VDEV RESTART\n"); + qdf_print("VDEV RESTART"); ret = wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_RESTART_REQUEST_CMDID); } else { - qdf_print("VDEV START\n"); + qdf_print("VDEV START"); ret = wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_START_REQUEST_CMDID); } @@ -236,7 +235,7 @@ QDF_STATUS send_vdev_set_nac_rssi_cmd_non_tlv(wmi_unified_t wmi, buf = wmi_buf_alloc(wmi, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -247,7 +246,7 @@ QDF_STATUS send_vdev_set_nac_rssi_cmd_non_tlv(wmi_unified_t wmi, WMI_CHAR_ARRAY_TO_MAC_ADDR(param->bssid_addr, &cmd->bssid_addr); WMI_CHAR_ARRAY_TO_MAC_ADDR(param->client_addr, &cmd->client_addr); if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_SET_SCAN_NAC_RSSI_CMDID)) { - qdf_print("%s: ERROR: Host unable to send LOWI request to FW\n", __func__); + qdf_print("%s: ERROR: Host unable to send LOWI request to FW", __func__); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -272,7 +271,7 @@ static QDF_STATUS send_vdev_set_neighbour_rx_cmd_non_tlv(wmi_unified_t wmi_handl buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_vdev_filter_nrp_config_cmd *)wmi_buf_data(buf); @@ -302,7 +301,7 @@ static QDF_STATUS send_vdev_set_fwtest_param_cmd_non_tlv(wmi_unified_t wmi_handl buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -329,7 +328,7 @@ static QDF_STATUS send_vdev_config_ratemask_cmd_non_tlv(wmi_unified_t wmi_handle buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_vdev_config_ratemask *)wmi_buf_data(buf); @@ -337,9 +336,8 @@ static QDF_STATUS send_vdev_config_ratemask_cmd_non_tlv(wmi_unified_t wmi_handle cmd->type = param->type; cmd->mask_lower32 = param->lower32; cmd->mask_higher32 = param->higher32; - qdf_print("Setting vdev ratemask vdev id = 0x%X, type = 0x%X," - "mask_l32 = 0x%X mask_h32 = 0x%X\n", - param->vdev_id, param->type, param->lower32, param->higher32); + qdf_print("Setting vdev ratemask vdev id = 0x%X, type = 0x%X, mask_l32 = 0x%X mask_h32 = 0x%X", + param->vdev_id, param->type, param->lower32, param->higher32); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_RATEMASK_CMDID); } @@ -372,7 +370,7 @@ static QDF_STATUS send_setup_install_key_cmd_non_tlv(wmi_unified_t wmi_handle, len = roundup(len, sizeof(u_int32_t)); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_install_key_cmd *)wmi_buf_data(buf); @@ -464,7 +462,7 @@ static QDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_flush_tids_cmd *)wmi_buf_data(buf); @@ -494,7 +492,7 @@ static QDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_delete_cmd *)wmi_buf_data(buf); @@ -583,7 +581,7 @@ static QDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_set_param_cmd *)wmi_buf_data(buf); @@ -613,14 +611,14 @@ static QDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_up_cmd *)wmi_buf_data(buf); cmd->vdev_id = param->vdev_id; cmd->vdev_assoc_id = param->assoc_id; WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid, &cmd->vdev_bssid); - qdf_print("%s for vap %d (%pK)\n", __func__, param->vdev_id, wmi_handle); + qdf_print("%s for vap %d (%pK)", __func__, param->vdev_id, wmi_handle); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_UP_CMDID); } @@ -640,7 +638,7 @@ static QDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_create_cmd *)wmi_buf_data(buf); @@ -666,7 +664,7 @@ static QDF_STATUS send_peer_add_wds_entry_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_peer_add_wds_entry_cmd *)wmi_buf_data(buf); @@ -693,7 +691,7 @@ static QDF_STATUS send_peer_del_wds_entry_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_remove_wds_entry_cmd *)wmi_buf_data(buf); @@ -719,7 +717,7 @@ QDF_STATUS send_set_bridge_mac_addr_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } qdf_mem_zero(null_macaddr, IEEE80211_ADDR_LEN); @@ -748,7 +746,7 @@ static QDF_STATUS send_peer_update_wds_entry_cmd_non_tlv(wmi_unified_t wmi_handl buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -785,7 +783,7 @@ static QDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_green_ap_ps_enable_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -799,7 +797,7 @@ static QDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle, #ifdef OL_GREEN_AP_DEBUG_CONFIG_INTERACTIONS qdf_print("%s: Sent WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID.\n" - "enable=%u status=%d\n", + "enable=%u status=%d", __func__, value, ret); @@ -847,7 +845,7 @@ send_pdev_utf_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, (chunkLen + sizeof(segHdrInfo))); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -927,7 +925,7 @@ send_pdev_qvit_cmd_non_tlv(wmi_unified_t wmi_handle, /* #ifdef QVIT_DEBUG - qdf_print(KERN_INFO "QVIT: %s: called\n", __func__); + qdf_print(KERN_INFO "QVIT: %s: called", __func__); #endif */ bufpos = param->utf_payload; @@ -946,8 +944,8 @@ send_pdev_qvit_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, (chunkLen + sizeof(segHdrInfo))); if (!buf) { - qdf_print(KERN_ERR "QVIT: %s: wmi_buf_alloc failed\n", - __func__); + qdf_print("QVIT: %s: wmi_buf_alloc failed", + __func__); return QDF_STATUS_E_FAILURE; } @@ -1004,7 +1002,7 @@ send_pdev_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_param_cmd *)wmi_buf_data(buf); @@ -1090,11 +1088,11 @@ static QDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, 4); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } res = wmi_unified_cmd_send(wmi_handle, buf, 4, WMI_WOW_ENABLE_CMDID); - qdf_print("send_wow_enable result: %d\n", res); + qdf_print("send_wow_enable result: %d", res); return (res == QDF_STATUS_SUCCESS) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_FAILURE; } @@ -1112,12 +1110,12 @@ static QDF_STATUS send_wow_wakeup_cmd_non_tlv(wmi_unified_t wmi_handle) buf = wmi_buf_alloc(wmi_handle, 4); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } res = wmi_unified_cmd_send(wmi_handle, buf, 4, WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID); - qdf_print("ol_wow_wakeup result: %d\n", res); + qdf_print("ol_wow_wakeup result: %d", res); return (res == QDF_STATUS_SUCCESS) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_FAILURE; } @@ -1139,7 +1137,7 @@ static QDF_STATUS send_wow_add_wakeup_event_cmd_non_tlv(wmi_unified_t wmi_handle buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_DEL_EVT_CMD *)wmi_buf_data(buf); @@ -1175,7 +1173,7 @@ static QDF_STATUS send_wow_add_wakeup_pattern_cmd_non_tlv(wmi_unified_t wmi_hand buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_PATTERN_CMD *)wmi_buf_data(buf); @@ -1216,7 +1214,7 @@ static QDF_STATUS send_wow_remove_wakeup_pattern_cmd_non_tlv(wmi_unified_t wmi_h buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_DEL_PATTERN_CMD *)wmi_buf_data(buf); @@ -1245,7 +1243,7 @@ static QDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -1274,7 +1272,7 @@ static QDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -1303,10 +1301,10 @@ static QDF_STATUS send_set_ps_mode_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } - qdf_print("%s:set psmode=%d\n", __func__, param->psmode); + qdf_print("%s:set psmode=%d", __func__, param->psmode); cmd = (wmi_sta_powersave_mode_cmd *)wmi_buf_data(buf); cmd->vdev_id = param->vdev_id; cmd->sta_ps_mode = param->psmode; @@ -1333,7 +1331,7 @@ static QDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (WMI_FORCE_FW_HANG_CMD *)wmi_buf_data(buf); @@ -1367,11 +1365,10 @@ send_dbglog_cmd_non_tlv(wmi_unified_t wmi_handle, cmd = (WMI_DBGLOG_CFG_CMD *)(wmi_buf_data(osbuf)); - qdf_print("wmi_dbg_cfg_send: mod[0]%08x dbgcfg%08x cfgvalid[0] %08x" - " cfgvalid[1] %08x\n", - dbglog_param->module_id_bitmap[0], - dbglog_param->val, dbglog_param->cfgvalid[0], - dbglog_param->cfgvalid[1]); + qdf_print("wmi_dbg_cfg_send: mod[0]%08x dbgcfg%08x cfgvalid[0] %08x cfgvalid[1] %08x", + dbglog_param->module_id_bitmap[0], + dbglog_param->val, dbglog_param->cfgvalid[0], + dbglog_param->cfgvalid[1]); cmd->config.cfgvalid[0] = dbglog_param->cfgvalid[0]; cmd->config.cfgvalid[1] = dbglog_param->cfgvalid[1]; @@ -1407,7 +1404,7 @@ static QDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_vdev_set_param_cmd *)wmi_buf_data(buf); @@ -1461,7 +1458,7 @@ static QDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_INVAL; } @@ -1496,7 +1493,7 @@ static QDF_STATUS send_bss_chan_info_request_cmd_non_tlv(wmi_unified_t wmi_handl buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_INVAL; } @@ -1530,7 +1527,7 @@ static QDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_pktlog_enable_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_pktlog_enable_cmd *)wmi_buf_data(buf); @@ -1557,7 +1554,7 @@ static QDF_STATUS send_packet_log_disable_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, 0); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } if (wmi_unified_cmd_send(wmi_handle, buf, len, @@ -1592,7 +1589,7 @@ static QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_buf = wmi_buf_alloc(wmi_handle, roundup(len, sizeof(u_int32_t))); if (!wmi_buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_bcn_tx_cmd *)wmi_buf_data(wmi_buf); @@ -1621,7 +1618,7 @@ static QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle, qdf_mem_copy(cmd->bufp, wmi_buf_data(param->wbuf), bcn_len); #endif #ifdef DEBUG_BEACON - qdf_print("%s frm length %d\n", __func__, bcn_len); + qdf_print("%s frm length %d", __func__, bcn_len); #endif wmi_unified_cmd_send(wmi_handle, wmi_buf, roundup(len, sizeof(u_int32_t)), WMI_BCN_TX_CMDID); @@ -1646,7 +1643,7 @@ static QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_buf = wmi_buf_alloc(wmi_handle, roundup(len, sizeof(u_int32_t))); if (!wmi_buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -1689,7 +1686,7 @@ static QDF_STATUS send_bcn_prb_template_cmd_non_tlv(wmi_unified_t wmi_handle, */ buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_bcn_prb_tmpl_cmd *)wmi_buf_data(buf); @@ -1729,7 +1726,7 @@ static QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_peer_assoc_complete_cmd *)wmi_buf_data(buf); @@ -1936,7 +1933,7 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, } buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_start_scan_cmd *)wmi_buf_data(buf); @@ -2092,7 +2089,7 @@ static QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle, WMI_HOST_IF_MSG_COPY_CHAR_ARRAY(ie_data->ie_data, param->extraie.ptr, param->extraie.len); } - qdf_print("Sending SCAN START cmd\n"); + qdf_print("Sending SCAN START cmd"); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_START_SCAN_CMDID); } @@ -2112,7 +2109,7 @@ static QDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_stop_scan_cmd *)wmi_buf_data(buf); @@ -2163,7 +2160,7 @@ static QDF_STATUS send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle, sizeof(wmi_channel)*param->nallchans; buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2236,7 +2233,7 @@ static QDF_STATUS send_thermal_mitigation_param_cmd_non_tlv(wmi_unified_t wmi_ha len = sizeof(tt_config_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (tt_config_t *) wmi_buf_data(buf); @@ -2276,10 +2273,10 @@ static QDF_STATUS send_phyerr_enable_cmd_non_tlv(wmi_unified_t wmi_handle) return QDF_STATUS_E_NOMEM; } - qdf_print("%s: about to send\n", __func__); + qdf_print("%s: about to send", __func__); if (wmi_unified_cmd_send(wmi_handle, buf, 32, WMI_PDEV_DFS_ENABLE_CMDID) != QDF_STATUS_SUCCESS) { - qdf_print("%s: send failed\n", __func__); + qdf_print("%s: send failed", __func__); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -2305,10 +2302,10 @@ static QDF_STATUS send_phyerr_disable_cmd_non_tlv(wmi_unified_t wmi_handle) return QDF_STATUS_E_NOMEM; } - qdf_print("%s: about to send\n", __func__); + qdf_print("%s: about to send", __func__); if (wmi_unified_cmd_send(wmi_handle, buf, 32, WMI_PDEV_DFS_DISABLE_CMDID) != QDF_STATUS_SUCCESS) { - qdf_print("%s: send failed\n", __func__); + qdf_print("%s: send failed", __func__); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -2333,7 +2330,7 @@ static QDF_STATUS send_smart_ant_enable_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_smart_ant_enable_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2372,10 +2369,9 @@ static QDF_STATUS send_smart_ant_enable_cmd_non_tlv(wmi_unified_t wmi_handle, WMI_PDEV_SMART_ANT_ENABLE_CMDID); if (ret != 0) { - qdf_print(" %s :WMI Failed\n", __func__); + qdf_print(" %s :WMI Failed", __func__); qdf_print("%s: Failed to send WMI_PDEV_SMART_ANT_ENABLE_CMDID.\n" - "enable:%d mode:%d rx_antenna: 0x%08x PINS: " - "[%d %d %d %d] Func[%d %d %d %d] cmdstatus=%d\n", + "enable:%d mode:%d rx_antenna: 0x%08x PINS: [%d %d %d %d] Func[%d %d %d %d] cmdstatus=%d", __func__, cmd->enable, cmd->mode, @@ -2411,7 +2407,7 @@ static QDF_STATUS send_smart_ant_set_rx_ant_cmd_non_tlv(wmi_unified_t wmi_handle len = sizeof(wmi_pdev_smart_ant_set_rx_antenna_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2423,9 +2419,9 @@ static QDF_STATUS send_smart_ant_set_rx_ant_cmd_non_tlv(wmi_unified_t wmi_handle WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID); if (ret != 0) { - qdf_print(" %s :WMI Failed\n", __func__); + qdf_print(" %s :WMI Failed", __func__); qdf_print("%s: Failed to send WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID.\n" - " rx_antenna: 0x%08x cmdstatus=%d\n", + " rx_antenna: 0x%08x cmdstatus=%d", __func__, cmd->rx_antenna, ret); @@ -2453,7 +2449,7 @@ static QDF_STATUS send_smart_ant_set_tx_ant_cmd_non_tlv(wmi_unified_t wmi_handle len = sizeof(wmi_peer_sant_set_tx_antenna_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2469,9 +2465,9 @@ static QDF_STATUS send_smart_ant_set_tx_ant_cmd_non_tlv(wmi_unified_t wmi_handle WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); if (ret != 0) { - qdf_print(" %s :WMI Failed\n", __func__); + qdf_print(" %s :WMI Failed", __func__); qdf_print("%s: Failed to send WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID.\n" - " Node: %s tx_antennas: [0x%08x 0x%08x] cmdstatus=%d\n", + " Node: %s tx_antennas: [0x%08x 0x%08x] cmdstatus=%d", __func__, ether_sprintf(macaddr), cmd->antenna_series[0], @@ -2503,7 +2499,7 @@ static QDF_STATUS send_smart_ant_set_training_info_cmd_non_tlv( len = sizeof(wmi_peer_sant_set_train_antenna_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2521,10 +2517,9 @@ static QDF_STATUS send_smart_ant_set_training_info_cmd_non_tlv( WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); if (ret != 0) { - qdf_print(" %s :WMI Failed\n", __func__); + qdf_print(" %s :WMI Failed", __func__); qdf_print("%s: Failed to Send WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID.\n" - " Train Node: %s rate_array[0x%02x 0x%02x] " - "tx_antennas: [0x%08x 0x%08x] cmdstatus=%d\n", + " Train Node: %s rate_array[0x%02x 0x%02x] tx_antennas: [0x%08x 0x%08x] cmdstatus=%d", __func__, ether_sprintf(macaddr), cmd->train_rate_series[0], @@ -2559,14 +2554,14 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_non_tlv(wmi_unified_t wmi_h if ((param->args_count == 0) || (param->args_count > (sizeof(cmd->args) / sizeof(cmd->args[0])))) { - qdf_print("%s: Can't send a command with %d arguments\n", - __func__, param->args_count); + qdf_print("%s: Can't send a command with %d arguments", + __func__, param->args_count); return QDF_STATUS_E_FAILURE; } buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2584,11 +2579,9 @@ static QDF_STATUS send_smart_ant_set_node_config_cmd_non_tlv(wmi_unified_t wmi_h WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); if (ret != 0) { - qdf_print(" %s :WMI Failed\n", __func__); - qdf_print("%s: Sent " - "WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID, cmd_id:" - " 0x%x\n Node: %s cmdstatus=%d\n", - __func__, param->cmd_id, ether_sprintf(macaddr), ret); + qdf_print(" %s :WMI Failed", __func__); + qdf_print("%s: Sent WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID, cmd_id: 0x%x\n Node: %s cmdstatus=%d", + __func__, param->cmd_id, ether_sprintf(macaddr), ret); } return ret; } @@ -2616,7 +2609,7 @@ static QDF_STATUS send_smart_ant_enable_tx_feedback_cmd_non_tlv( len = sizeof(wmi_pdev_pktlog_enable_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_pktlog_enable_cmd *)wmi_buf_data(buf); @@ -2629,7 +2622,7 @@ static QDF_STATUS send_smart_ant_enable_tx_feedback_cmd_non_tlv( } else if (param->enable == 0) { buf = wmi_buf_alloc(wmi_handle, 0); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } if (!wmi_unified_cmd_send(wmi_handle, buf, len, @@ -2659,7 +2652,7 @@ static QDF_STATUS send_vdev_spectral_configure_cmd_non_tlv(wmi_unified_t wmi_han len = sizeof(wmi_vdev_spectral_configure_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2691,48 +2684,47 @@ static QDF_STATUS send_vdev_spectral_configure_cmd_non_tlv(wmi_unified_t wmi_han len, WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID); #ifdef OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS - qdf_print("%s: Sent " - "WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID\n", __func__); + qdf_print("%s: Sent WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID", __func__); qdf_print("vdev_id = %u\n" - "spectral_scan_count = %u\n" - "spectral_scan_period = %u\n" - "spectral_scan_priority = %u\n" - "spectral_scan_fft_size = %u\n" - "spectral_scan_gc_ena = %u\n" - "spectral_scan_restart_ena = %u\n" - "spectral_scan_noise_floor_ref = %u\n" - "spectral_scan_init_delay = %u\n" - "spectral_scan_nb_tone_thr = %u\n" - "spectral_scan_str_bin_thr = %u\n" - "spectral_scan_wb_rpt_mode = %u\n" - "spectral_scan_rssi_rpt_mode = %u\n" - "spectral_scan_rssi_thr = %u\n" - "spectral_scan_pwr_format = %u\n" - "spectral_scan_rpt_mode = %u\n" - "spectral_scan_bin_scale = %u\n" - "spectral_scan_dBm_adj = %u\n" - "spectral_scan_chn_mask = %u\n", - param->vdev_id, - param->count, - param->period, - param->spectral_pri, - param->fft_size, - param->gc_enable, - param->restart_enable, - param->noise_floor_ref, - param->init_delay, - param->nb_tone_thr, - param->str_bin_thr, - param->wb_rpt_mode, - param->rssi_rpt_mode, - param->rssi_thr, - param->pwr_format, - param->rpt_mode, - param->bin_scale, - param->dbm_adj, - param->chn_mask); - qdf_print("%s: Status: %d\n\n", __func__, ret); + "spectral_scan_count = %u\n" + "spectral_scan_period = %u\n" + "spectral_scan_priority = %u\n" + "spectral_scan_fft_size = %u\n" + "spectral_scan_gc_ena = %u\n" + "spectral_scan_restart_ena = %u\n" + "spectral_scan_noise_floor_ref = %u\n" + "spectral_scan_init_delay = %u\n" + "spectral_scan_nb_tone_thr = %u\n" + "spectral_scan_str_bin_thr = %u\n" + "spectral_scan_wb_rpt_mode = %u\n" + "spectral_scan_rssi_rpt_mode = %u\n" + "spectral_scan_rssi_thr = %u\n" + "spectral_scan_pwr_format = %u\n" + "spectral_scan_rpt_mode = %u\n" + "spectral_scan_bin_scale = %u\n" + "spectral_scan_dBm_adj = %u\n" + "spectral_scan_chn_mask = %u", + param->vdev_id, + param->count, + param->period, + param->spectral_pri, + param->fft_size, + param->gc_enable, + param->restart_enable, + param->noise_floor_ref, + param->init_delay, + param->nb_tone_thr, + param->str_bin_thr, + param->wb_rpt_mode, + param->rssi_rpt_mode, + param->rssi_thr, + param->pwr_format, + param->rpt_mode, + param->bin_scale, + param->dbm_adj, + param->chn_mask); + qdf_print("%s: Status: %d", __func__, ret); #endif /* OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS */ return ret; @@ -2853,7 +2845,7 @@ static QDF_STATUS send_vdev_spectral_enable_cmd_non_tlv(wmi_unified_t wmi_handle len = sizeof(wmi_vdev_spectral_enable_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -2881,12 +2873,12 @@ static QDF_STATUS send_vdev_spectral_enable_cmd_non_tlv(wmi_unified_t wmi_handle qdf_print("vdev_id = %u\n" "trigger_cmd = %u\n" - "enable_cmd = %u\n", + "enable_cmd = %u", cmd->vdev_id, cmd->trigger_cmd, cmd->enable_cmd); - qdf_print("%s: Status: %d\n\n", __func__, ret); + qdf_print("%s: Status: %d", __func__, ret); #endif /* OL_SPECTRAL_DEBUG_CONFIG_INTERACTIONS */ ret = wmi_unified_cmd_send(wmi_handle, @@ -2914,7 +2906,7 @@ send_pdev_set_regdomain_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -2948,7 +2940,7 @@ send_set_quiet_mode_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } quiet_cmd = (wmi_pdev_set_quiet_cmd *)wmi_buf_data(buf); @@ -2981,12 +2973,12 @@ send_set_beacon_filter_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } cmd = (wmi_add_bcn_filter_cmd_t *)wmi_buf_data(buf); cmd->vdev_id = param->vdev_id; - qdf_print("vdev_id: %d\n", cmd->vdev_id); + qdf_print("vdev_id: %d", cmd->vdev_id); for (i = 0; i < BCN_FLT_MAX_ELEMS_IE_LIST; i++) cmd->ie_map[i] = 0; @@ -3020,7 +3012,7 @@ send_remove_beacon_filter_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("buf alloc failed\n"); + qdf_print("buf alloc failed"); return QDF_STATUS_E_NOMEM; } cmd = (wmi_rmv_bcn_filter_cmd_t *)wmi_buf_data(buf); @@ -3047,7 +3039,7 @@ send_mgmt_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_buf = wmi_buf_alloc(wmi_handle, roundup(len, sizeof(u_int32_t))); if (!wmi_buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_mgmt_tx_cmd *)wmi_buf_data(wmi_buf); @@ -3103,7 +3095,7 @@ send_addba_clearresponse_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_addba_clear_resp_cmd *)wmi_buf_data(buf); @@ -3133,7 +3125,7 @@ send_addba_send_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_addba_send_cmd *)wmi_buf_data(buf); @@ -3165,7 +3157,7 @@ send_delba_send_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -3199,7 +3191,7 @@ send_addba_setresponse_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -3232,7 +3224,7 @@ send_singleamsdu_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -3265,7 +3257,7 @@ send_set_qboost_param_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -3294,7 +3286,7 @@ send_mu_scan_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(wmi_mu_start_cmd)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_mu_start_cmd *)wmi_buf_data(buf); @@ -3328,7 +3320,7 @@ send_lteu_config_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, sizeof(wmi_set_lteu_config)); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_set_lteu_config *)wmi_buf_data(buf); @@ -3366,7 +3358,7 @@ send_pdev_get_tpc_config_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_get_tpc_config_cmd *)wmi_buf_data(buf); @@ -3395,7 +3387,7 @@ send_set_bwf_cmd_non_tlv(wmi_unified_t wmi_handle, len += param->num_peers * sizeof(struct wmi_bwf_peer_info); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_peer_bwf_request *)wmi_buf_data(buf); @@ -3440,7 +3432,7 @@ send_set_atf_cmd_non_tlv(wmi_unified_t wmi_handle, len += param->num_peers * sizeof(struct wmi_atf_peer_info); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -3453,7 +3445,7 @@ send_set_atf_cmd_non_tlv(wmi_unified_t wmi_handle, sizeof(wmi_mac_addr)); peer_info[i].atf_units = param->peer_info[i].percentage_peer; } -/* qdf_print("wmi_unified_pdev_set_atf peer_num=%d\n", cmd->num_peers); */ +/* qdf_print("wmi_unified_pdev_set_atf peer_num=%d", cmd->num_peers); */ retval = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PEER_ATF_REQUEST_CMDID); return retval; @@ -3479,7 +3471,7 @@ send_atf_peer_request_cmd_non_tlv(wmi_unified_t wmi_handle, len += param->num_peers * sizeof(struct wmi_atf_peer_ext_info); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -3522,7 +3514,7 @@ send_set_atf_grouping_cmd_non_tlv(wmi_unified_t wmi_handle, len += param->num_groups * sizeof(struct wmi_atf_group_info); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -3561,7 +3553,7 @@ send_wlan_profile_enable_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_wlan_profile_enable_profile_id_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_wlan_profile_enable_profile_id_cmd *)wmi_buf_data(buf); @@ -3590,7 +3582,7 @@ send_wlan_profile_trigger_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_wlan_profile_trigger_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_wlan_profile_trigger_cmd *)wmi_buf_data(buf); @@ -3636,7 +3628,7 @@ send_set_ht_ie_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_ht_ie_cmd *)wmi_buf_data(buf); @@ -3672,7 +3664,7 @@ send_set_vht_ie_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_vht_ie_cmd *)wmi_buf_data(buf); @@ -3706,7 +3698,7 @@ send_wmm_update_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_SUCCESS; } cmd = (wmi_pdev_set_wmm_params_cmd *)wmi_buf_data(buf); @@ -3762,7 +3754,7 @@ send_set_ant_switch_tbl_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_set_ant_switch_tbl_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_set_ant_switch_tbl_cmd *)wmi_buf_data(buf); @@ -3798,10 +3790,10 @@ send_set_ratepwr_table_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_ratepwr_table_cmd); len += roundup(param->ratepwr_len, sizeof(uint32_t)) - sizeof(uint32_t); /* already 4 bytes in cmd structure */ - qdf_print("wmi buf len = %d\n", len); + qdf_print("wmi buf len = %d", len); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_ratepwr_table_cmd *)wmi_buf_data(buf); @@ -3833,10 +3825,10 @@ send_get_ratepwr_table_cmd_non_tlv(wmi_unified_t wmi_handle) wmi_pdev_ratepwr_table_cmd *cmd; len = sizeof(wmi_pdev_ratepwr_table_cmd); - qdf_print("wmi buf len = %d\n", len); + qdf_print("wmi buf len = %d", len); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_ratepwr_table_cmd *)wmi_buf_data(buf); @@ -3891,7 +3883,7 @@ send_set_ctl_table_cmd_non_tlv(wmi_unified_t wmi_handle, (WMI_HOST_NUM_BAND_EDGES_2G_40MHZ * 3) + (WMI_HOST_NUM_CTLS_2G_40MHZ * WMI_HOST_NUM_BAND_EDGES_2G_40MHZ) + 4)) { - qdf_print("CTL array len not correct\n"); + qdf_print("CTL array len not correct"); return QDF_STATUS_E_FAILURE; } } else { @@ -3917,7 +3909,7 @@ send_set_ctl_table_cmd_non_tlv(wmi_unified_t wmi_handle, (WMI_HOST_NUM_BAND_EDGES_5G_HT160 * 3) + (WMI_HOST_NUM_CTLS_5G_HT160 * WMI_HOST_NUM_BAND_EDGES_5G_HT160))) { - qdf_print("CTL array len not correct\n"); + qdf_print("CTL array len not correct"); return QDF_STATUS_E_FAILURE; } } @@ -3925,17 +3917,17 @@ send_set_ctl_table_cmd_non_tlv(wmi_unified_t wmi_handle, if (param->ctl_cmd_len != WMI_HOST_NUM_CTLS_2G * WMI_HOST_NUM_BAND_EDGES_2G * 2 + WMI_HOST_NUM_CTLS_5G * WMI_HOST_NUM_BAND_EDGES_5G * 2) { - qdf_print("CTL array len not correct\n"); + qdf_print("CTL array len not correct"); return QDF_STATUS_E_FAILURE; } } len = sizeof(wmi_pdev_set_ctl_table_cmd); len += roundup(param->ctl_cmd_len, sizeof(uint32_t)) - sizeof(uint32_t); - qdf_print("wmi buf len = %d\n", len); + qdf_print("wmi buf len = %d", len); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_ctl_table_cmd *)wmi_buf_data(buf); @@ -3948,7 +3940,7 @@ send_set_ctl_table_cmd_non_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_SET_CTL_TABLE_CMDID)) { - qdf_print("%s:Failed to send command\n", __func__); + qdf_print("%s:Failed to send command", __func__); return QDF_STATUS_E_FAILURE; } @@ -3977,7 +3969,7 @@ send_set_mimogain_table_cmd_non_tlv(wmi_unified_t wmi_handle, if (param->tbl_len % ((WMI_HOST_TX_NUM_CHAIN-1) * WMI_HOST_TPC_REGINDEX_MAX * WMI_HOST_ARRAY_GAIN_NUM_STREAMS) != 0) { - qdf_print("Array gain table len not correct\n"); + qdf_print("Array gain table len not correct"); return QDF_STATUS_E_FAILURE; } @@ -3985,7 +3977,7 @@ send_set_mimogain_table_cmd_non_tlv(wmi_unified_t wmi_handle, len += roundup(param->tbl_len, sizeof(uint32_t)) - sizeof(uint32_t); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_mimogain_table_cmd *)wmi_buf_data(buf); @@ -4030,7 +4022,7 @@ send_set_ratepwr_chainmsk_cmd_non_tlv(wmi_unified_t wmi_handle, len += roundup(param->num_rate*sizeof(uint32_t), sizeof(uint32_t)); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_ratepwr_chainmsk_tbl_cmd *)wmi_buf_data(buf); @@ -4067,7 +4059,7 @@ send_set_macaddr_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_pdev_set_base_macaddr_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_set_base_macaddr_cmd *)wmi_buf_data(buf); @@ -4101,9 +4093,9 @@ send_pdev_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle) int len = sizeof(wmi_pdev_scan_cmd); buf = wmi_buf_alloc(wmi_handle, len); - qdf_print("%s:\n", __func__); + qdf_print("%s:", __func__); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_scan_cmd *)wmi_buf_data(buf); @@ -4133,9 +4125,9 @@ send_pdev_scan_end_cmd_non_tlv(wmi_unified_t wmi_handle) int len = sizeof(wmi_pdev_scan_cmd); buf = wmi_buf_alloc(wmi_handle, len); - qdf_print("%s:\n", __func__); + qdf_print("%s:", __func__); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_scan_cmd *)wmi_buf_data(buf); @@ -4164,7 +4156,7 @@ send_set_acparams_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -4195,7 +4187,7 @@ send_set_vap_dscp_tid_map_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len_vdev); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -4205,7 +4197,7 @@ send_set_vap_dscp_tid_map_cmd_non_tlv(wmi_unified_t wmi_handle, cmd_vdev->vdev_id = param->vdev_id; - qdf_print("Setting dscp for vap id: %d\n", cmd_vdev->vdev_id); + qdf_print("Setting dscp for vap id: %d", cmd_vdev->vdev_id); return wmi_unified_cmd_send(wmi_handle, buf, len_vdev, WMI_VDEV_SET_DSCP_TID_MAP_CMDID); } @@ -4227,7 +4219,7 @@ send_proxy_ast_reserve_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_reserve_ast_entry_cmd *)wmi_buf_data(buf); @@ -4235,8 +4227,8 @@ send_proxy_ast_reserve_cmd_non_tlv(wmi_unified_t wmi_handle, cmd->key_id = 0; cmd->mcast = 0; - qdf_print("%s macaddr=%s key_id=%d mcast=%d\n", __func__, - ether_sprintf(param->macaddr), cmd->key_id, cmd->mcast); + qdf_print("%s macaddr=%s key_id=%d mcast=%d", __func__, + ether_sprintf(param->macaddr), cmd->key_id, cmd->mcast); return wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_RESERVE_AST_ENTRY_CMDID); @@ -4273,7 +4265,7 @@ send_pdev_fips_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -4380,8 +4372,8 @@ send_pdev_fips_cmd_non_tlv(wmi_unified_t wmi_handle, } else { cmd->mode = FIPS_ENGINE_AES_CTR; } - qdf_print(KERN_ERR "Key len = %d, Data len = %d\n", - cmd->key_len, cmd->data_len); + qdf_print("Key len = %d, Data len = %d", + cmd->key_len, cmd->data_len); print_hex_dump(KERN_DEBUG, "Key: ", DUMP_PREFIX_NONE, 16, 1, cmd->key, cmd->key_len, true); @@ -4390,9 +4382,9 @@ send_pdev_fips_cmd_non_tlv(wmi_unified_t wmi_handle, retval = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_FIPS_CMDID); - qdf_print("%s return value %d\n", __func__, retval); + qdf_print("%s return value %d", __func__, retval); } else { - qdf_print("\n%s:%d Key or Data is NULL\n", __func__, __LINE__); + qdf_print("\n%s:%d Key or Data is NULL", __func__, __LINE__); retval = -EFAULT; } @@ -4416,7 +4408,7 @@ send_pdev_set_chan_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -4450,7 +4442,7 @@ send_pdev_set_chan_cmd_non_tlv(wmi_unified_t wmi_handle, if ((param->phy_mode == MODE_11AC_VHT80_80) || (param->phy_mode == MODE_11AC_VHT160)) { qdf_print( - "WMI channel freq=%d, mode=%x band_center_freq1=%d band_center_freq2=%d\n", + "WMI channel freq=%d, mode=%x band_center_freq1=%d band_center_freq2=%d", cmd->chan.mhz, WMI_GET_CHANNEL_MODE(&cmd->chan), cmd->chan.band_center_freq1, cmd->chan.band_center_freq2); @@ -4485,7 +4477,7 @@ send_mcast_group_update_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_peer_mcast_group_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_mcast_group_cmd *) wmi_buf_data(buf); @@ -4583,7 +4575,7 @@ send_periodic_chan_stats_config_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_set_periodic_channel_stats_config); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: Unable to allocate merory\n", __func__); + qdf_print("%s: Unable to allocate merory", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_set_periodic_channel_stats_config *) wmi_buf_data(buf); @@ -4594,7 +4586,7 @@ send_periodic_chan_stats_config_cmd_non_tlv(wmi_unified_t wmi_handle, WMI_SET_PERIODIC_CHANNEL_STATS_CONFIG); if (error) - qdf_print(" %s :WMI Failed\n", __func__); + qdf_print(" %s :WMI Failed", __func__); return error; } @@ -4815,7 +4807,7 @@ send_rtt_meas_req_test_cmd_non_tlv(wmi_unified_t wmi_handle, wmi_rtt_measreq_body *body; wmi_channel *w_chan; - qdf_print("%s: The request ID is: %d\n", __func__, param->req_id); + qdf_print("%s: The request ID is: %d", __func__, param->req_id); len = sizeof(wmi_rtt_measreq_head) + param->req_num_req * sizeof(wmi_rtt_measreq_body); @@ -4853,7 +4845,7 @@ send_rtt_meas_req_test_cmd_non_tlv(wmi_unified_t wmi_handle, qdf_mem_copy(peer, param->mac_addr, 6); qdf_print("The mac_addr is" - " %.2x:%.2x:%.2x:%.2x:%.2x:%.2x extra=%d\n", + " %.2x:%.2x:%.2x:%.2x:%.2x:%.2x extra=%d", peer[0], peer[1], peer[2], peer[3], peer[4], peer[5], param->extra); */ @@ -4909,8 +4901,8 @@ send_rtt_meas_req_test_cmd_non_tlv(wmi_unified_t wmi_handle, } ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_RTT_MEASREQ_CMDID); - qdf_print("send rtt cmd to FW with length %d and return %d\n", - len, ret); + qdf_print("send rtt cmd to FW with length %d and return %d", + len, ret); return QDF_STATUS_SUCCESS; } @@ -5047,8 +5039,8 @@ send_rtt_meas_req_cmd_non_tlv(wmi_unified_t wmi_handle, ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_RTT_MEASREQ_CMDID); - qdf_print("send rtt cmd to FW with length %d and return %d\n", - len, ret); + qdf_print("send rtt cmd to FW with length %d and return %d", + len, ret); return ret; } /** @@ -5071,7 +5063,7 @@ send_rtt_keepalive_req_cmd_non_tlv(wmi_unified_t wmi_handle, len = sizeof(wmi_rtt_keepalive_cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("No WMI resource\n"); + qdf_print("No WMI resource"); return QDF_STATUS_E_FAILURE; } ptr = (uint8_t *)wmi_buf_data(buf); @@ -5124,8 +5116,8 @@ send_lci_set_cmd_non_tlv(wmi_unified_t wmi_handle, /* colocated_bss[1] contains num of vaps */ /* Provide colocated bssid subIE only when there are 2 vaps or more */ if (param->colocated_bss[1] > 1) { - qdf_print("%s: Adding %d co-located BSSIDs to LCI data\n", - __func__, param->colocated_bss[1]); + qdf_print("%s: Adding %d co-located BSSIDs to LCI data", + __func__, param->colocated_bss[1]); /* Convert num_vaps to octets: 6*Num_of_vap + 1 (Max BSSID Indicator field) */ param->colocated_bss[1] = @@ -5135,10 +5127,10 @@ send_lci_set_cmd_non_tlv(wmi_unified_t wmi_handle, param->colocated_bss, colocated_bss_len); rtt_req->co_located_bssid_len = colocated_bss_len; - qdf_print("%s: co_located_bssid_len: %d\n", __func__, - param->colocated_bss[1]+2); + qdf_print("%s: co_located_bssid_len: %d", __func__, + param->colocated_bss[1] + 2); } else { - qdf_print("No co-located BSSID was added to LCI data\n"); + qdf_print("No co-located BSSID was added to LCI data"); } buf = wmi_buf_alloc(wmi_handle, len); @@ -5243,7 +5235,7 @@ send_start_oem_data_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, data_len); if (!buf) { - qdf_print("%s: No WMI resource!\n", __func__); + qdf_print("%s: No WMI resource!", __func__); return QDF_STATUS_E_FAILURE; } @@ -5255,8 +5247,8 @@ send_start_oem_data_cmd_non_tlv(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, data_len, WMI_OEM_REQ_CMDID)) { - qdf_print("%s: ERROR: Host unable to send LOWI request to FW\n", - __func__); + qdf_print("%s: ERROR: Host unable to send LOWI request to FW", + __func__); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -5378,7 +5370,7 @@ send_pdev_caldata_version_check_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_check_cal_version_cmd *)wmi_buf_data(buf); @@ -5409,7 +5401,7 @@ send_btcoex_wlan_priority_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_btcoex_cfg_cmd *) wmi_buf_data(buf); @@ -5441,7 +5433,7 @@ send_btcoex_duty_cycle_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_btcoex_cfg_cmd *) wmi_buf_data(buf); @@ -5472,7 +5464,7 @@ send_coex_ver_cfg_cmd_non_tlv(wmi_unified_t wmi_handle, coex_ver_cfg_t *param) buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (coex_ver_cfg_t *)wmi_buf_data(buf); @@ -5508,7 +5500,7 @@ send_smart_logging_enable_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -5549,7 +5541,7 @@ send_smart_logging_fatal_cmd_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -5656,7 +5648,7 @@ static QDF_STATUS init_cmd_send_non_tlv(wmi_unified_t wmi_handle, mem_chunk_len = (sizeof(wlan_host_memory_chunk) * MAX_MEM_CHUNKS); buf = wmi_buf_alloc(wmi_handle, len + mem_chunk_len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -5669,9 +5661,9 @@ static QDF_STATUS init_cmd_send_non_tlv(wmi_unified_t wmi_handle, host_mem_chunks[idx].ptr = param->mem_chunks[idx].paddr; host_mem_chunks[idx].size = param->mem_chunks[idx].len; host_mem_chunks[idx].req_id = param->mem_chunks[idx].req_id; - qdf_print("chunk %d len %d requested , ptr 0x%x\n", - idx, cmd->host_mem_chunks[idx].size, - cmd->host_mem_chunks[idx].ptr); + qdf_print("chunk %d len %d requested , ptr 0x%x", + idx, cmd->host_mem_chunks[idx].size, + cmd->host_mem_chunks[idx].ptr); } cmd->num_host_mem_chunks = param->num_mem_chunks; if (param->num_mem_chunks > 1) @@ -5703,14 +5695,14 @@ static QDF_STATUS send_ext_resource_config_non_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len + (sizeof(wmi_ext_resource_config) + PAD_LENGTH)); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd_cfg = (wmi_ext_resource_config *)wmi_buf_data(buf); qdf_mem_copy(cmd_cfg, ext_cfg, sizeof(wmi_ext_resource_config)); qdf_print("\nSending Ext resource cfg: HOST PLATFORM as %d\n" - "fw_feature_bitmap as %x to TGT\n", + "fw_feature_bitmap as %x to TGT", cmd_cfg->host_platform_config, cmd_cfg->fw_feature_bitmap); if (wmi_unified_cmd_send(wmi_handle, buf, @@ -6046,8 +6038,8 @@ static uint32_t ready_extract_init_status_non_tlv(wmi_unified_t wmi_hdl, void *evt_buf) { wmi_ready_event *ev = (wmi_ready_event *) evt_buf; - qdf_print("Version = %d %d status = %d\n", ev->sw_version, - ev->abi_version, ev->status); + qdf_print("Version = %d %d status = %d", ev->sw_version, + ev->abi_version, ev->status); return ev->status; } @@ -7123,7 +7115,7 @@ static uint8_t *copy_rtt_report_cfr(wmi_host_rtt_meas_event *ev, MEM_ALIGN(TONE_VHT_80M) }; if (hdump == NULL) { - qdf_print("Destination buffer is NULL\n"); + qdf_print("Destination buffer is NULL"); return p; } temp1 = temp2 = hdump; @@ -7219,7 +7211,7 @@ static QDF_STATUS extract_rtt_ev_non_tlv(wmi_unified_t wmi_handle, void *evt_buf ev->rssi3 = 0; p = copy_rtt_report_cfr(ev, report_type, p, hdump, hdump_len); } else { - qdf_print("Error!body is NULL\n"); + qdf_print("Error!body is NULL"); return QDF_STATUS_E_FAILURE; } @@ -7300,7 +7292,7 @@ static QDF_STATUS extract_comb_phyerr_non_tlv(wmi_unified_t wmi_handle, void *ev data = (uint8_t *) evt_buf; #if ATH_PHYERR_DEBUG - qdf_print("%s: data=%pK, datalen=%d\n", __func__, data, datalen); + qdf_print("%s: data=%pK, datalen=%d", __func__, data, datalen); /* XXX for now */ for (i = 0; i < datalen; i++) { @@ -7319,8 +7311,8 @@ static QDF_STATUS extract_comb_phyerr_non_tlv(wmi_unified_t wmi_handle, void *ev pe = (wmi_comb_phyerr_rx_event *) data; #if ATH_PHYERR_DEBUG - qdf_print("%s: pe->hdr.num_phyerr_events=%d\n", - __func__, + qdf_print("%s: pe->hdr.num_phyerr_events=%d", + __func__, pe->hdr.num_phyerr_events); #endif /* ATH_PHYERR_DEBUG */ @@ -7376,7 +7368,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, /* ensure there's at least space for the header */ if ((datalen - n) < sizeof(ev->hdr)) { qdf_print( - "%s: not enough space? (datalen=%d, n=%d, hdr=%zd bytes\n", + "%s: not enough space? (datalen=%d, n=%d, hdr=%zd bytes", __func__, datalen, n, @@ -7402,35 +7394,33 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, * If "int" is 64 bits then this becomes a moot point. */ if (ev->hdr.buf_len > PHYERROR_MAX_BUFFER_LENGTH) { - qdf_print("%s: buf_len is garbage? (0x%x\n)\n", - __func__, - ev->hdr.buf_len); + qdf_print("%s: buf_len is garbage? (0x%x\n)", + __func__, + ev->hdr.buf_len); return QDF_STATUS_SUCCESS; } if (n + ev->hdr.buf_len > datalen) { - qdf_print("%s: buf_len exceeds available space " - "(n=%d, buf_len=%d, datalen=%d\n", - __func__, - n, - ev->hdr.buf_len, - datalen); + qdf_print("%s: buf_len exceeds available space (n=%d, buf_len=%d, datalen=%d", + __func__, + n, + ev->hdr.buf_len, + datalen); return QDF_STATUS_SUCCESS; } phyerr->phy_err_code = WMI_UNIFIED_PHYERRCODE_GET(&ev->hdr); #if ATH_PHYERR_DEBUG - qdf_print("%s: len=%d, tsf=0x%08x, rssi = 0x%x/0x%x/0x%x/0x%x, " - "comb rssi = 0x%x, phycode=%d\n", - __func__, - ev->hdr.buf_len, - ev->hdr.tsf_timestamp, - ev->hdr.rssi_chain0, - ev->hdr.rssi_chain1, - ev->hdr.rssi_chain2, - ev->hdr.rssi_chain3, - WMI_UNIFIED_RSSI_COMB_GET(&ev->hdr), - phyerr->phy_err_code); + qdf_print("%s: len=%d, tsf=0x%08x, rssi = 0x%x/0x%x/0x%x/0x%x, comb rssi = 0x%x, phycode=%d", + __func__, + ev->hdr.buf_len, + ev->hdr.tsf_timestamp, + ev->hdr.rssi_chain0, + ev->hdr.rssi_chain1, + ev->hdr.rssi_chain2, + ev->hdr.rssi_chain3, + WMI_UNIFIED_RSSI_COMB_GET(&ev->hdr), + phyerr->phy_err_code); /* * For now, unroll this loop - the chain 'value' field isn't @@ -7438,7 +7428,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, * Grr. :-) */ qdf_print( - "%s: chain 0: raw=0x%08x; pri20=%d sec20=%d sec40=%d sec80=%d\n", + "%s: chain 0: raw=0x%08x; pri20=%d sec20=%d sec40=%d sec80=%d", __func__, ev->hdr.rssi_chain0, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 0, PRI20), @@ -7447,7 +7437,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 0, SEC80)); qdf_print( - "%s: chain 1: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d\n", + "%s: chain 1: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d", __func__, ev->hdr.rssi_chain1, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 1, PRI20), @@ -7456,7 +7446,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 1, SEC80)); qdf_print( - "%s: chain 2: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d\n", + "%s: chain 2: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d", __func__, ev->hdr.rssi_chain2, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 2, PRI20), @@ -7465,7 +7455,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 2, SEC80)); qdf_print( - "%s: chain 3: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d\n", + "%s: chain 3: raw=0x%08x: pri20=%d sec20=%d sec40=%d sec80=%d", __func__, ev->hdr.rssi_chain3, WMI_UNIFIED_RSSI_CHAN_GET(&ev->hdr, 3, PRI20), @@ -7475,7 +7465,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, qdf_print( - "%s: freq_info_1=0x%08x, freq_info_2=0x%08x\n", + "%s: freq_info_1=0x%08x, freq_info_2=0x%08x", __func__, ev->hdr.freq_info_1, ev->hdr.freq_info_2); /* @@ -7484,7 +7474,7 @@ static QDF_STATUS extract_single_phyerr_non_tlv(wmi_unified_t wmi_handle, */ qdf_print( "%s: nfval[1]=0x%08x, nfval[2]=0x%08x, nf=%d/%d/%d/%d, " - "freq1=%d, freq2=%d, cw=%d\n", + "freq1=%d, freq2=%d, cw=%d", __func__, ev->hdr.nf_list_1, ev->hdr.nf_list_2, @@ -8561,7 +8551,7 @@ QDF_STATUS send_wds_entry_list_cmd_non_tlv(wmi_unified_t wmi_handle) if (wmi_unified_cmd_send(wmi_handle, buf, 32, WMI_PDEV_WDS_ENTRY_LIST_CMDID) != QDF_STATUS_SUCCESS) { - qdf_print("%s: send failed\n", __func__); + qdf_print("%s: send failed", __func__); wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -9601,7 +9591,7 @@ void wmi_non_tlv_attach(struct wmi_unified *wmi_handle) /*(uint8 *)(*wmi_id_to_name)(uint32_t cmd_id);*/ #endif #else - qdf_print("%s: Not supported\n", __func__); + qdf_print("%s: Not supported", __func__); #endif } qdf_export_symbol(wmi_non_tlv_attach); diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c index df681b696d..78e2f9566a 100644 --- a/wmi_unified_tlv.c +++ b/wmi_unified_tlv.c @@ -1014,7 +1014,7 @@ static QDF_STATUS send_peer_add_wds_entry_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_peer_add_wds_entry_cmd_fixed_param *) wmi_buf_data(buf); @@ -1047,7 +1047,7 @@ static QDF_STATUS send_peer_del_wds_entry_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } cmd = (wmi_peer_remove_wds_entry_cmd_fixed_param *)wmi_buf_data(buf); @@ -1077,7 +1077,7 @@ static QDF_STATUS send_peer_update_wds_entry_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -13486,7 +13486,7 @@ send_pdev_fips_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -13515,8 +13515,8 @@ send_pdev_fips_cmd_tlv(wmi_unified_t wmi_handle, } else { cmd->mode = FIPS_ENGINE_AES_CTR; } - qdf_print(KERN_ERR "Key len = %d, Data len = %d\n", - cmd->key_len, cmd->data_len); + qdf_print("Key len = %d, Data len = %d", + cmd->key_len, cmd->data_len); print_hex_dump(KERN_DEBUG, "Key: ", DUMP_PREFIX_NONE, 16, 1, cmd->key, cmd->key_len, true); @@ -13536,9 +13536,9 @@ send_pdev_fips_cmd_tlv(wmi_unified_t wmi_handle, retval = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_FIPS_CMDID); - qdf_print("%s return value %d\n", __func__, retval); + qdf_print("%s return value %d", __func__, retval); } else { - qdf_print("\n%s:%d Key or Data is NULL\n", __func__, __LINE__); + qdf_print("\n%s:%d Key or Data is NULL", __func__, __LINE__); wmi_buf_free(buf); retval = -QDF_STATUS_E_BADMSG; } @@ -16108,7 +16108,7 @@ static QDF_STATUS init_cmd_send_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len + mem_chunk_len + hw_mode_len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -16329,7 +16329,7 @@ QDF_STATUS send_bcn_offload_control_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -17376,7 +17376,7 @@ static QDF_STATUS extract_service_ready_tlv(wmi_unified_t wmi_handle, ev = (wmi_service_ready_event_fixed_param *) param_buf->fixed_param; if (!ev) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -17532,7 +17532,7 @@ static host_mem_req *extract_host_mem_req_tlv(wmi_unified_t wmi_handle, ev = (wmi_service_ready_event_fixed_param *) param_buf->fixed_param; if (!ev) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return NULL; } @@ -17560,7 +17560,7 @@ save_fw_version_in_service_ready_tlv(wmi_unified_t wmi_handle, void *evt_buf) ev = (wmi_service_ready_event_fixed_param *) param_buf->fixed_param; if (!ev) { - qdf_print("%s: wmi_buf_alloc failed\n", __func__); + qdf_print("%s: wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } @@ -17588,7 +17588,7 @@ static uint32_t ready_extract_init_status_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_READY_EVENTID_param_tlvs *) evt_buf; ev = param_buf->fixed_param; - qdf_print("%s:%d\n", __func__, ev->status); + qdf_print("%s:%d", __func__, ev->status); return ev->status; } @@ -17702,13 +17702,13 @@ static QDF_STATUS extract_vdev_start_resp_tlv(wmi_unified_t wmi_handle, param_buf = (WMI_VDEV_START_RESP_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - qdf_print("Invalid start response event buffer\n"); + qdf_print("Invalid start response event buffer"); return QDF_STATUS_E_INVAL; } ev = param_buf->fixed_param; if (!ev) { - qdf_print("Invalid start response event buffer\n"); + qdf_print("Invalid start response event buffer"); return QDF_STATUS_E_INVAL; } @@ -17724,7 +17724,7 @@ static QDF_STATUS extract_vdev_start_resp_tlv(wmi_unified_t wmi_handle, vdev_rsp->resp_type = WMI_HOST_VDEV_RESTART_RESP_EVENT; break; default: - qdf_print("Invalid start response event buffer\n"); + qdf_print("Invalid start response event buffer"); break; }; vdev_rsp->status = ev->status; @@ -17787,7 +17787,7 @@ static QDF_STATUS extract_tbttoffset_num_vdevs_tlv(void *wmi_hdl, param_buf = (WMI_TBTTOFFSET_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - qdf_print("Invalid tbtt update ext event buffer\n"); + qdf_print("Invalid tbtt update ext event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_event = param_buf->fixed_param; @@ -17813,7 +17813,7 @@ static QDF_STATUS extract_ext_tbttoffset_num_vdevs_tlv(void *wmi_hdl, param_buf = (WMI_TBTTOFFSET_EXT_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - qdf_print("Invalid tbtt update ext event buffer\n"); + qdf_print("Invalid tbtt update ext event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_ext_event = param_buf->fixed_param; @@ -17842,7 +17842,7 @@ static QDF_STATUS extract_tbttoffset_update_params_tlv(void *wmi_hdl, param_buf = (WMI_TBTTOFFSET_UPDATE_EVENTID_param_tlvs *) evt_buf; if (!param_buf) { - qdf_print("Invalid tbtt update event buffer\n"); + qdf_print("Invalid tbtt update event buffer"); return QDF_STATUS_E_INVAL; } @@ -17875,7 +17875,7 @@ static QDF_STATUS extract_ext_tbttoffset_update_params_tlv(void *wmi_hdl, param_buf = (WMI_TBTTOFFSET_EXT_UPDATE_EVENTID_param_tlvs *)evt_buf; if (!param_buf) { - qdf_print("Invalid tbtt update event buffer\n"); + qdf_print("Invalid tbtt update event buffer"); return QDF_STATUS_E_INVAL; } tbtt_offset_info = ¶m_buf->tbtt_offset_info[idx]; @@ -19217,7 +19217,7 @@ static QDF_STATUS extract_chainmask_tables_tlv(wmi_unified_t wmi_handle, for (i = 0; i < hw_caps->num_chainmask_tables; i++) { - qdf_print("Dumping chain mask combo data for table : %d\n", i); + qdf_print("Dumping chain mask combo data for table : %d", i); for (j = 0; j < chainmask_table[i].num_valid_chainmasks; j++) { chainmask_table[i].cap_list[j].chainmask = @@ -19253,9 +19253,9 @@ static QDF_STATUS extract_chainmask_tables_tlv(wmi_unified_t wmi_handle, chainmask_table[i].cap_list[j].supports_aDFS = WMI_SUPPORT_CHAIN_MASK_ADFS_GET(chainmask_caps->supported_flags); - qdf_print("supported_flags: 0x%08x chainmasks: 0x%08x\n", - chainmask_caps->supported_flags, - chainmask_caps->chainmask + qdf_print("supported_flags: 0x%08x chainmasks: 0x%08x", + chainmask_caps->supported_flags, + chainmask_caps->chainmask ); chainmask_caps++; } @@ -19316,7 +19316,7 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle, if (hw_caps) { param->num_chainmask_tables = hw_caps->num_chainmask_tables; - qdf_print("Num chain mask tables: %d\n", hw_caps->num_chainmask_tables); + qdf_print("Num chain mask tables: %d", hw_caps->num_chainmask_tables); } else param->num_chainmask_tables = 0; @@ -19325,13 +19325,13 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle, if (chain_mask_combo == NULL) return QDF_STATUS_SUCCESS; - qdf_print("Dumping chain mask combo data\n"); + qdf_print("Dumping chain mask combo data"); for (i = 0; i < param->num_chainmask_tables; i++) { - qdf_print("table_id : %d Num valid chainmasks: %d\n", - chain_mask_combo->chainmask_table_id, - chain_mask_combo->num_valid_chainmask + qdf_print("table_id : %d Num valid chainmasks: %d", + chain_mask_combo->chainmask_table_id, + chain_mask_combo->num_valid_chainmask ); param->chainmask_table[i].table_id = @@ -19340,7 +19340,7 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle, chain_mask_combo->num_valid_chainmask; chain_mask_combo++; } - qdf_print("chain mask combo end\n"); + qdf_print("chain mask combo end"); return QDF_STATUS_SUCCESS; } @@ -21191,7 +21191,7 @@ send_pdev_caldata_version_check_cmd_tlv(wmi_unified_t wmi_handle, buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_FAILURE; } cmd = (wmi_pdev_check_cal_version_cmd_fixed_param *)wmi_buf_data(buf); @@ -21261,7 +21261,7 @@ static QDF_STATUS send_btm_config_cmd_tlv(wmi_unified_t wmi_handle, len = sizeof(*cmd); buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { - qdf_print("%s:wmi_buf_alloc failed\n", __func__); + qdf_print("%s:wmi_buf_alloc failed", __func__); return QDF_STATUS_E_NOMEM; }