wifi: ath: Use the unified QMI service ID instead of defining it locally

Instead of defining a local macro with a custom name for the QMI
service identifier, use the one provided in qmi.h and remove the
locally defined macro.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
Acked-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
Link: https://patch.msgid.link/20260316171419.2619620-3-daniel.lezcano@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index e7f90fd9e9b8399f81642f73905f155f0209bce6..af58f88c27e18a5ebae4b783b81357cbd498aade 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -1112,7 +1112,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size)
        spin_lock_init(&qmi->event_lock);
        INIT_WORK(&qmi->event_work, ath10k_qmi_driver_event_work);
 
-       ret = qmi_add_lookup(&qmi->qmi_hdl, WLFW_SERVICE_ID_V01,
+       ret = qmi_add_lookup(&qmi->qmi_hdl, QMI_SERVICE_ID_WLFW,
                             WLFW_SERVICE_VERS_V01, 0);
        if (ret)
                goto err_qmi_lookup;

diff --git a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
index 9f311f3bc9e7f9eb20bfc83fa0f38a91a2c3a220..88d58f78989dd0e8766fc29e352c4abf0062ae31 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
+++ b/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h
@@ -7,7 +7,6 @@
 #ifndef WCN3990_QMI_SVC_V01_H
 #define WCN3990_QMI_SVC_V01_H
 
-#define WLFW_SERVICE_ID_V01 0x45
 #define WLFW_SERVICE_VERS_V01 0x01
 
 #define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index feebbc30f3df32a0df14f73a703169564c7bf659..1397756d625151f6f36f404329975973d205f841 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -3337,7 +3337,7 @@ int ath11k_qmi_init_service(struct ath11k_base *ab)
        spin_lock_init(&ab->qmi.event_lock);
        INIT_WORK(&ab->qmi.event_work, ath11k_qmi_driver_event_work);
 
-       ret = qmi_add_lookup(&ab->qmi.handle, ATH11K_QMI_WLFW_SERVICE_ID_V01,
+       ret = qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW,
                             ATH11K_QMI_WLFW_SERVICE_VERS_V01,
                             ab->qmi.service_ins_id);
        if (ret < 0) {

diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index 7968ab122b65dc28a44eca7b34904f55f717f586..eae416db8b525b9cc4059aefdbc41925d4f4f096 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -15,7 +15,6 @@
 #define ATH11K_QMI_MAX_BDF_FILE_NAME_SIZE      64
 #define ATH11K_QMI_CALDB_ADDRESS               0x4BA00000
 #define ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128
-#define ATH11K_QMI_WLFW_SERVICE_ID_V01         0x45
 #define ATH11K_QMI_WLFW_SERVICE_VERS_V01       0x01
 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01     0x02
 #define ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390     0x01

diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index 8c5dacf227da5c39d3927c22bf00443fa019fd39..fd762b5d7bb597de5add5f6d7b559d089247a2fb 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -4061,7 +4061,7 @@ int ath12k_qmi_init_service(struct ath12k_base *ab)
        spin_lock_init(&ab->qmi.event_lock);
        INIT_WORK(&ab->qmi.event_work, ath12k_qmi_driver_event_work);
 
-       ret = qmi_add_lookup(&ab->qmi.handle, ATH12K_QMI_WLFW_SERVICE_ID_V01,
+       ret = qmi_add_lookup(&ab->qmi.handle, QMI_SERVICE_ID_WLFW,
                             ATH12K_QMI_WLFW_SERVICE_VERS_V01,
                             ab->qmi.service_ins_id);
        if (ret < 0) {

diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index b5a4a01391cbacc121e0c6f2f20276a75d171340..2a63e214eb42c5526607351a97fab2118eb26238 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -15,7 +15,6 @@
 #define ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE      64
 #define ATH12K_QMI_CALDB_ADDRESS               0x4BA00000
 #define ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128
-#define ATH12K_QMI_WLFW_SERVICE_ID_V01         0x45
 #define ATH12K_QMI_WLFW_SERVICE_VERS_V01       0x01
 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01     0x02
 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1