diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 17:33:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 17:33:55 -0700 |
| commit | fe89e9b1af14794a4df9d45b958ff1adf0b98dc1 (patch) | |
| tree | 13460b0932f9b9cf18e7dd058284c63ae14422bd /include/linux | |
| parent | c5c06e278019892391ef4d47933796cacfec29cb (diff) | |
| parent | ba7a4754da1092decbeea3b29bf7d5946f1be400 (diff) | |
Merge tag 'rpmsg-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson:
"The remove functions of the Qualcomm SMD and GLINK RPM platform
drivers are transitioned to the new void returning prototype. Likewise
is qcom_smd_unregister_edge() transitioned to void, as it
unconditionally returned 0.
An assumption about the ordering of the intent request acknowledgement
and advertisement of a new intent in the GLINK implementation is
corrected. Faulty error handling is corrected is improved in the TX
path, and duplicated code, in the same path, is cleaned up"
* tag 'rpmsg-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
rpmsg: glink: Consolidate TX_DATA and TX_DATA_CONT
rpmsg: glink: Propagate TX failures in intentless mode as well
rpmsg: glink: Wait for intent, not just request ack
rpmsg: glink: Transition intent request signaling to wait queue
rpmsg: qcom_smd: Convert to platform remove callback returning void
rpmsg: qcom_glink_rpm: Convert to platform remove callback returning void
rpmsg: qcom_smd: Make qcom_smd_unregister_edge() return void
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rpmsg/qcom_smd.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/rpmsg/qcom_smd.h b/include/linux/rpmsg/qcom_smd.h index 2e92d7407a85..3379bf4e1cb1 100644 --- a/include/linux/rpmsg/qcom_smd.h +++ b/include/linux/rpmsg/qcom_smd.h @@ -11,7 +11,7 @@ struct qcom_smd_edge; struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent, struct device_node *node); -int qcom_smd_unregister_edge(struct qcom_smd_edge *edge); +void qcom_smd_unregister_edge(struct qcom_smd_edge *edge); #else @@ -22,9 +22,8 @@ qcom_smd_register_edge(struct device *parent, return NULL; } -static inline int qcom_smd_unregister_edge(struct qcom_smd_edge *edge) +static inline void qcom_smd_unregister_edge(struct qcom_smd_edge *edge) { - return 0; } #endif |