Use a WARN_ON() when SCMI stack is loaded to check the consistency of configured SCMI transports instead of the current compile-time check BUILD_BUG_ON() to avoid breaking bot-builds on random bad configs. Bail-out early and noisy during SCMI stack initialization if no transport was enabled in configuration since SCMI cannot work without at least one enabled transport and such constraint cannot be enforced in Kconfig due to circular dependency issues.
Unified · Split
| @@ -2067,9 +2067,11 @@ static int __init scmi_driver_init(void) · 2066 unmodified lines | |||
| 2067 | { | 2067 | { |
| 2068 | int ret; | 2068 | int ret; |
| 2069 | 2069 | ||
| 2070 | scmi_bus_init(); | 2070 | /* Bail out if no SCMI transport was configured */ |
| 2071 | if (WARN_ON(!IS_ENABLED(CONFIG_ARM_SCMI_HAVE_TRANSPORT))) | ||
| 2072 | return -EINVAL; | ||
| 2071 | 2073 | ||
| 2072 | BUILD_BUG_ON(!IS_ENABLED(CONFIG_ARM_SCMI_HAVE_TRANSPORT)); | 2074 | scmi_bus_init(); |
| 2073 | 2075 | ||
| 2074 | /* Initialize any compiled-in transport which provided an init/exit */ | 2076 | /* Initialize any compiled-in transport which provided an init/exit */ |
| 2075 | ret = scmi_transports_init(); | 2077 | ret = scmi_transports_init(); |