diff options
| author | Srinivas Kandagatla <srini@kernel.org> | 2026-05-29 14:03:35 +0100 |
|---|---|---|
| committer | Srinivas Kandagatla <srini@kernel.org> | 2026-05-29 14:03:35 +0100 |
| commit | c81f110e205f79a5f5551caa717b881e0ddf3e1d (patch) | |
| tree | adfc18913764797daac37f5b792a93958672a449 /drivers | |
| parent | 7aa41590ac55284cdf46ffb64ec9587a4d450fe0 (diff) | |
| parent | 05f3f5984121e1956867b309c76a750c1d4c9682 (diff) | |
| download | linux-next-history-c81f110e205f79a5f5551caa717b881e0ddf3e1d.tar.gz | |
Merge branches 'slimbus-fixes' and 'slimbus-for-7.2' into slimbus-for-next
* slimbus-fixes:
slimbus: qcom-ngd-ctrl: Avoid ABBA on tx_lock/ctrl->lock
slimbus: qcom-ngd-ctrl: Balance pm_runtime enablement for NGD
slimbus: qcom-ngd-ctrl: Initialize controller resources in controller
slimbus: qcom-ngd-ctrl: Register callbacks after creating the ngd
slimbus: qcom-ngd-ctrl: Correct PDR and SSR cleanup ownership
slimbus: qcom-ngd-ctrl: Fix probe error path ordering
slimbus: qcom-ngd-ctrl: Fix up platform_driver registration
slimbus: qcom-ngd-ctrl: fix OF node refcount
* slimbus-for-7.2:
slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/slimbus/qcom-ngd-ctrl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 3071e46d03bea..80877e951849f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -48,7 +48,6 @@ NGD_INT_RX_MSG_RCVD) /* Slimbus QMI service */ -#define SLIMBUS_QMI_SVC_ID 0x0301 #define SLIMBUS_QMI_SVC_V1 1 #define SLIMBUS_QMI_INS_ID 0 #define SLIMBUS_QMI_SELECT_INSTANCE_REQ_V01 0x0020 @@ -1408,8 +1407,8 @@ static int qcom_slim_ngd_qmi_svc_event_init(struct qcom_slim_ngd_ctrl *ctrl) return ret; } - ret = qmi_add_lookup(&qmi->svc_event_hdl, SLIMBUS_QMI_SVC_ID, - SLIMBUS_QMI_SVC_V1, SLIMBUS_QMI_INS_ID); + ret = qmi_add_lookup(&qmi->svc_event_hdl, QMI_SERVICE_ID_SLIMBUS, + SLIMBUS_QMI_SVC_V1, SLIMBUS_QMI_INS_ID); if (ret < 0) { dev_err(ctrl->dev, "qmi_add_lookup failed: %d\n", ret); qmi_handle_release(&qmi->svc_event_hdl); |