soc: qcom: pdr: 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. Signed-off-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Link: https://lore.kernel.org/r/20260309230346.3584252-7-daniel.lezcano@oss.qualcomm.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>master
parent
6fc1aa70bc
commit
24f80cbe0b
|
|
@ -523,7 +523,7 @@ struct pdr_service *pdr_add_lookup(struct pdr_handle *pdr,
|
|||
if (!pds)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
pds->service = SERVREG_NOTIFIER_SERVICE;
|
||||
pds->service = QMI_SERVICE_ID_SERVREG_NOTIF;
|
||||
strscpy(pds->service_name, service_name, sizeof(pds->service_name));
|
||||
strscpy(pds->service_path, service_path, sizeof(pds->service_path));
|
||||
pds->need_locator_lookup = true;
|
||||
|
|
@ -678,7 +678,7 @@ struct pdr_handle *pdr_handle_alloc(void (*status)(int state,
|
|||
if (ret < 0)
|
||||
goto destroy_indack;
|
||||
|
||||
ret = qmi_add_lookup(&pdr->locator_hdl, SERVREG_LOCATOR_SERVICE, 1, 1);
|
||||
ret = qmi_add_lookup(&pdr->locator_hdl, QMI_SERVICE_ID_SERVREG_LOC, 1, 1);
|
||||
if (ret < 0)
|
||||
goto release_qmi_handle;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@
|
|||
|
||||
#include <linux/soc/qcom/pdr.h>
|
||||
|
||||
#define SERVREG_LOCATOR_SERVICE 0x40
|
||||
#define SERVREG_NOTIFIER_SERVICE 0x42
|
||||
|
||||
#define SERVREG_REGISTER_LISTENER_REQ 0x20
|
||||
#define SERVREG_GET_DOMAIN_LIST_REQ 0x21
|
||||
#define SERVREG_STATE_UPDATED_IND_ID 0x22
|
||||
|
|
|
|||
|
|
@ -661,7 +661,7 @@ static struct qcom_pdm_data *qcom_pdm_start(void)
|
|||
goto err_stop;
|
||||
}
|
||||
|
||||
ret = qmi_add_server(&data->handle, SERVREG_LOCATOR_SERVICE,
|
||||
ret = qmi_add_server(&data->handle, QMI_SERVICE_ID_SERVREG_LOC,
|
||||
SERVREG_QMI_VERSION, SERVREG_QMI_INSTANCE);
|
||||
if (ret) {
|
||||
pr_err("PDM: error adding server %d\n", ret);
|
||||
|
|
|
|||
Loading…
Reference in New Issue