ath11k: clean up in qmi source files
PATCH 1/1 ath11k: clean up in qmi source files
Fix coding style, Remove unused variable.
--- drivers/net/wireless/ath/ath11k/qmi.c | 36 +++++++++--------------- drivers/net/wireless/ath/ath11k/qmi.h | 53 ++++++++++++++++------------------- 2 files changed, 37 insertions(+), 52 deletions(-)
drivers/net/wireless/ath/ath11k/qmi.c +13 -23
@@ -312,7 +312,7 @@ .array_type = NO_ARRAY, .tlv_type = 0x11, .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, - initiate_cal_download_enable), + initiate_cal_download_enable), }, { .data_type = QMI_OPT_FLAG,
@@ -570,7 +570,6 @@ struct qmi_elem_info qmi_wlanfw_ind_register_resp_msg_v01_ei[] = { }, }; -static struct qmi_elem_info qmi_wlanfw_mem_seg_s_v01_ei[] = { { .data_type =QMI_UNSIGNED_4_BYTE ,
@@ -1640,12 +1639,6 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab) goto out;for (i =0 ; i < req.mem_seg_len ; i++) { -if (!ab->qmi.target_mem[i].paddr || !ab->qmi.target_mem[i].size) { -ath11k_warn (ab,"qmi invalid mem request for target\n" ); - ret = -EINVAL ; - goto out; - } - req.mem_seg[i].addr = ab->qmi.target_mem[i].paddr; req.mem_seg[i].size = ab->qmi.target_mem[i].size; req.mem_seg[i].type = ab->qmi.target_mem[i].type;
@@ -1684,8 +1677,8 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab)int i, idx, mode = ab->qmi.target_mem_mode;if (of_property_read_u32_array (dev->of_node,"qcom,bdf-addr" , - &bdf_location[0 ], -ARRAY_SIZE (bdf_location))) { + &bdf_location[0 ], +ARRAY_SIZE (bdf_location))) {ath11k_warn (ab,"qmi no bdf_addr in device_tree\n" );return -EINVAL ; }
@@ -1704,17 +1697,16 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab)ath11k_warn (ab,"qmi mem size is low to load caldata\n" );return -EINVAL ; } - ab->qmi.target_mem[idx].paddr = - bdf_location[mode] +ATH11K_QMI_CALDATA_OFFSET ; - ab->qmi.target_mem[idx].vaddr = - bdf_location[mode] +ATH11K_QMI_CALDATA_OFFSET ; +/* TODO ath11k does not support cold boot calibration */ + ab->qmi.target_mem[idx].paddr =0 ; + ab->qmi.target_mem[idx].vaddr =0 ; ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; idx++;break ;default :ath11k_warn (ab,"qmi ignore invalid mem req type %d\n" , - ab->qmi.target_mem[i].type); + ab->qmi.target_mem[i].type);break ; } }
@@ -1787,7 +1779,6 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)return ret; } - static int ath11k_qmi_prepare_bdf_download(struct ath11k_base *ab, int type, struct qmi_wlanfw_bdf_download_req_msg_v01 *req,
@@ -1814,7 +1805,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)break ;case ATH11K_QMI_FILE_TYPE_CALDATA :snprintf (filename,sizeof (filename), -"%s/%s" ,ab->hw_params.fw.dir,ATH11K_QMI_DEFAULT_CAL_FILE_NAME ); +"%s/%s" , ab->hw_params.fw.dir,ATH11K_QMI_DEFAULT_CAL_FILE_NAME ); ret =request_firmware (&fw_entry, filename, dev);if (ret) {ath11k_warn (ab,"qmi failed to load CAL: %s\n" , filename);
@@ -1831,7 +1822,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)release_firmware (fw_entry);break ;default : - ret =-EINVAL ; + ret = -EINVAL ; goto out; }
@@ -1859,7 +1850,7 @@ static int ath11k_qmi_load_bdf(struct ath11k_base *ab)if (of_property_read_u32_array (dev->of_node,"qcom,bdf-addr" , &location[0 ],ARRAY_SIZE (location))) {ath11k_err (ab,"qmi bdf_addr is not in device_tree\n" ); - ret =-EINVAL ; + ret = -EINVAL ; goto out; }
@@ -1910,7 +1901,7 @@ static int ath11k_qmi_load_bdf(struct ath11k_base *ab)if (resp.resp.result !=QMI_RESULT_SUCCESS_V01 ) {ath11k_warn (ab,"qmi BDF download failed, result: %d, err: %d\n" , - resp.resp.result, resp.resp.error); + resp.resp.result, resp.resp.error); ret = resp.resp.result; goto out_qmi_bdf; }
@@ -2257,7 +2248,6 @@ static void ath11k_qmi_msg_fw_ready_cb(struct qmi_handle *qmi_hdl,ath11k_qmi_driver_event_post (qmi,ATH11K_QMI_EVENT_FW_READY ,NULL ); } - static void ath11k_qmi_msg_cold_boot_cal_done_cb(struct qmi_handle *qmi, struct sockaddr_qrtr *sq, struct qmi_txn *txn,
@@ -2426,8 +2416,8 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)INIT_WORK (&ab->qmi.event_work, ath11k_qmi_driver_event_work); ret =qmi_add_lookup (&ab->qmi.handle,ATH11K_QMI_WLFW_SERVICE_ID_V01 , -ATH11K_QMI_WLFW_SERVICE_VERS_V01 , -ATH11K_QMI_WLFW_SERVICE_INS_ID_V01 ); +ATH11K_QMI_WLFW_SERVICE_VERS_V01 , +ATH11K_QMI_WLFW_SERVICE_INS_ID_V01 );if (ret <0 ) {ath11k_warn (ab,"failed to add qmi lookup\n" );return ret;
drivers/net/wireless/ath/ath11k/qmi.h +24 -29
113 lines not on this page · raw message
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 3 lines · Anilkumar Kolli
Fix coding style, Remove unused variable.
Signed-off-by Anilkumar Kolli <[email protected]>
Fails to apply, most likely due to my GCC warning patch. Please rebase.
Recorded preimage for 'drivers/net/wireless/ath/ath11k/qmi.c'
error: Failed to merge in the changes.
Applying: ath11k: clean up in qmi source files
Using index info to reconstruct a base tree...
M drivers/net/wireless/ath/ath11k/qmi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath11k/qmi.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath11k/qmi.c Patch failed at 0001 ath11k: clean up in qmi source files
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Changes Requested.
Signature · 9 lines
https://patchwork.kernel.org/patch/10931175/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k