diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2022-05-07 22:39:01 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-06 17:47:16 -0400 |
| commit | c5ef2025579e91f132cd3cead8ebe8b4cd5dd2b6 (patch) | |
| tree | c9b613cd72ed69a70dadd6afbd01b3021d6b6518 | |
| parent | 3800b318c5303633f056bc6ab387ef01906cee57 (diff) | |
| download | u-boot-c5ef2025579e91f132cd3cead8ebe8b4cd5dd2b6.zip u-boot-c5ef2025579e91f132cd3cead8ebe8b4cd5dd2b6.tar.gz u-boot-c5ef2025579e91f132cd3cead8ebe8b4cd5dd2b6.tar.bz2 | |
dm: fix DM_EVENT dependencies
CONFIG_DM_EVENT without CONFIG_EVENT is non-functional.
Let CONFIG_DM_EVENT depend on CONFIG_EVENT.
Remove superfluous stub in include/event.h.
Fixes: 5b896ed5856f ("event: Add events for device probe/remove")
Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
| -rw-r--r-- | drivers/core/Kconfig | 3 | ||||
| -rw-r--r-- | include/event.h | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 27d6578..9b9a714 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -89,8 +89,7 @@ config DM_DEVICE_REMOVE config DM_EVENT bool "Support events with driver model" - depends on DM - imply EVENT + depends on DM && EVENT default y if SANDBOX help This enables support for generating events related to driver model diff --git a/include/event.h b/include/event.h index 62e72a7..7765f07 100644 --- a/include/event.h +++ b/include/event.h @@ -144,7 +144,6 @@ int event_register(const char *id, enum event_t type, event_handler_t func, /** event_show_spy_list( - Show a list of event spies */ void event_show_spy_list(void); -#if CONFIG_IS_ENABLED(EVENT) /** * event_notify() - notify spies about an event * @@ -159,6 +158,7 @@ void event_show_spy_list(void); */ int event_notify(enum event_t type, void *data, int size); +#if CONFIG_IS_ENABLED(EVENT) /** * event_notify_null() - notify spies about an event * @@ -169,11 +169,6 @@ int event_notify(enum event_t type, void *data, int size); */ int event_notify_null(enum event_t type); #else -static inline int event_notify(enum event_t type, void *data, int size) -{ - return 0; -} - static inline int event_notify_null(enum event_t type) { return 0; |