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.
Signed-off-by: Daniel Lezcano <[email protected]> --- drivers/net/ipa/ipa_qmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c index d771f3a71f94..37936ad132a2 100644 --- a/drivers/net/ipa/ipa_qmi.c +++ b/drivers/net/ipa/ipa_qmi.c @@ -66,11 +66,9 @@ * determination of when things are "ready" */ -#define IPA_HOST_SERVICE_SVC_ID 0x31 #define IPA_HOST_SVC_VERS 1 #define IPA_HOST_SERVICE_INS_ID 1 -#define IPA_MODEM_SERVICE_SVC_ID 0x31 #define IPA_MODEM_SERVICE_INS_ID 2 #define IPA_MODEM_SVC_VERS 1 @@ -484,7 +482,7 @@ int ipa_qmi_setup(struct ipa *ipa) if (ret) return ret; - ret = qmi_add_server(&ipa_qmi->server_handle, IPA_HOST_SERVICE_SVC_ID, + ret = qmi_add_server(&ipa_qmi->server_handle, QMI_SERVICE_ID_IPA, IPA_HOST_SVC_VERS, IPA_HOST_SERVICE_INS_ID); if (ret) goto err_server_handle_release; @@ -501,7 +499,7 @@ int ipa_qmi_setup(struct ipa *ipa) /* We need this ready before the service lookup is added */ INIT_WORK(&ipa_qmi->init_driver_work, ipa_client_init_driver_work); - ret = qmi_add_lookup(&ipa_qmi->client_handle, IPA_MODEM_SERVICE_SVC_ID, + ret = qmi_add_lookup(&ipa_qmi->client_handle, QMI_SERVICE_ID_IPA, IPA_MODEM_SVC_VERS, IPA_MODEM_SERVICE_INS_ID); if (ret) goto err_client_handle_release; -- 2.43.0
