On Tue 05 Jan 20:38 CST 2021, Alex Elder wrote: > Stub functions are defined for SSR notifier registration in case > QCOM_RPROC_COMMON is not configured. As a result, code that uses > these functions can link successfully even if the common remoteproc > code is not built. > > Code that registers an SSR notifier function likely needs the > types defined in "qcom_rproc.h", but those are only exposed if > QCOM_RPROC_COMMON is enabled. > > Rearrange the conditional definition so the qcom_ssr_notify_data > structure and qcom_ssr_notify_type enumerated type are defined > whether or not QCOM_RPROC_COMMON is enabled. > Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> @Jakub, @Dave, as this is a prerequisite for allowing IPA to be compile tested feel free to merge it together with patch 3. Regards, Bjorn > Signed-off-by: Alex Elder <elder@xxxxxxxxxx> > --- > include/linux/remoteproc/qcom_rproc.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/remoteproc/qcom_rproc.h b/include/linux/remoteproc/qcom_rproc.h > index 6470516621749..82b211518136e 100644 > --- a/include/linux/remoteproc/qcom_rproc.h > +++ b/include/linux/remoteproc/qcom_rproc.h > @@ -3,8 +3,6 @@ > > struct notifier_block; > > -#if IS_ENABLED(CONFIG_QCOM_RPROC_COMMON) > - > /** > * enum qcom_ssr_notify_type - Startup/Shutdown events related to a remoteproc > * processor. > @@ -26,6 +24,8 @@ struct qcom_ssr_notify_data { > bool crashed; > }; > > +#if IS_ENABLED(CONFIG_QCOM_RPROC_COMMON) > + > void *qcom_register_ssr_notifier(const char *name, struct notifier_block *nb); > int qcom_unregister_ssr_notifier(void *notify, struct notifier_block *nb); > > -- > 2.20.1 >