diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-24 11:27:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-24 11:27:18 -0800 |
| commit | e40242b9820817a7afe520228c6a6a535e40d222 (patch) | |
| tree | d23eb05000489e4a9fb1f2f0ab22262776c77c07 /include | |
| parent | 890caa39a95933f6af3ed395f2a8a3db1fb0a85d (diff) | |
| parent | 3e35772bc1e42287c8f4c70055deb5e3f5a3e8b5 (diff) | |
| download | linux-stable-e40242b9820817a7afe520228c6a6a535e40d222.tar.gz linux-stable-e40242b9820817a7afe520228c6a6a535e40d222.tar.bz2 linux-stable-e40242b9820817a7afe520228c6a6a535e40d222.zip | |
Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"Fix two build issues in the GLINK driver and correct some kerneldoc in
the same"
* tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
rpmsg: glink: add include of header file
rpmsg: glink: Guard qcom_glink_ssr_notify() with correct config
rpmsg: glink: fix some kerneldoc comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rpmsg/qcom_glink.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/rpmsg/qcom_glink.h b/include/linux/rpmsg/qcom_glink.h index daded9fddf36..22fc3a69b683 100644 --- a/include/linux/rpmsg/qcom_glink.h +++ b/include/linux/rpmsg/qcom_glink.h @@ -7,12 +7,17 @@ struct qcom_glink; +#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK) +void qcom_glink_ssr_notify(const char *ssr_name); +#else +static inline void qcom_glink_ssr_notify(const char *ssr_name) {} +#endif + #if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK_SMEM) struct qcom_glink *qcom_glink_smem_register(struct device *parent, struct device_node *node); void qcom_glink_smem_unregister(struct qcom_glink *glink); -void qcom_glink_ssr_notify(const char *ssr_name); #else @@ -24,7 +29,6 @@ qcom_glink_smem_register(struct device *parent, } static inline void qcom_glink_smem_unregister(struct qcom_glink *glink) {} -static inline void qcom_glink_ssr_notify(const char *ssr_name) {} #endif #endif |