[PATCH 207/379][SRU][OEM-5.6] ath11k: remove define ATH11K_QMI_DEFAULT_CAL_FILE_NAME
You-Sheng Yang
vicamo.yang at canonical.com
Wed Dec 23 08:49:00 UTC 2020
From: Kalle Valo <kvalo at codeaurora.org>
BugLink: https://bugs.launchpad.net/bugs/1879633
It's just a duplicate of ATH11K_DEFAULT_CAL_FILE.
Signed-off-by: Kalle Valo <kvalo at codeaurora.org>
Link: https://lore.kernel.org/r/1592316055-24958-13-git-send-email-kvalo@codeaurora.org
(cherry picked from commit a9bf090932032bd259672814670df701ecb3ff51)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
drivers/net/wireless/ath/ath11k/qmi.c | 5 ++---
drivers/net/wireless/ath/ath11k/qmi.h | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index 495c0e1812d7..50812df6527d 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1810,11 +1810,10 @@ ath11k_qmi_prepare_bdf_download(struct ath11k_base *ab, int type,
ath11k_core_free_bdf(ab, &bd);
break;
case ATH11K_QMI_FILE_TYPE_CALDATA:
- fw_entry = ath11k_core_firmware_request(ab,
- ATH11K_QMI_DEFAULT_CAL_FILE_NAME);
+ fw_entry = ath11k_core_firmware_request(ab, ATH11K_DEFAULT_CAL_FILE);
if (ret) {
ath11k_warn(ab, "failed to load %s: %d\n",
- ATH11K_QMI_DEFAULT_CAL_FILE_NAME, ret);
+ ATH11K_DEFAULT_CAL_FILE, ret);
goto out;
}
diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index a7a0a189cbe4..3307be5be687 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -22,7 +22,6 @@
#define ATH11K_QMI_RESP_LEN_MAX 8192
#define ATH11K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01 32
#define ATH11K_QMI_CALDB_SIZE 0x480000
-#define ATH11K_QMI_DEFAULT_CAL_FILE_NAME "caldata.bin"
#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035
#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037
--
2.29.2
More information about the kernel-team
mailing list