| Message ID | ab0476382e3342161beda94a45ddadb49b026dcd.1747760015.git.robin.murphy@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] firmware: smccc: Stub out get_conduit() | expand |
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index a3863da1510e..97dc4d47c664 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -315,7 +315,14 @@ enum arm_smccc_conduit { * * When SMCCCv1.1 is not present, returns SMCCC_CONDUIT_NONE. */ +#ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void); +#else +static inline enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void) +{ + return SMCCC_CONDUIT_NONE; +} +#endif /** * arm_smccc_get_version()
Various callers use arm_smccc_1_1_get_conduit() to guard their arm_smccc_smc() calls - since the latter is already stubbed out to support optional usage in !HAVE_ARM_SMCCC configs, do the equivalent for the former as well to make life easier. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- include/linux/arm-smccc.h | 7 +++++++ 1 file changed, 7 insertions(+)