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: 5b896ed585 ("event: Add events for device probe/remove")
Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-05-07 22:39:01 +02:00 committed by Tom Rini
parent 3800b318c5
commit c5ef202557
2 changed files with 2 additions and 8 deletions

View file

@ -89,8 +89,7 @@ config DM_DEVICE_REMOVE
config DM_EVENT config DM_EVENT
bool "Support events with driver model" bool "Support events with driver model"
depends on DM depends on DM && EVENT
imply EVENT
default y if SANDBOX default y if SANDBOX
help help
This enables support for generating events related to driver model This enables support for generating events related to driver model

View file

@ -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 */ /** event_show_spy_list( - Show a list of event spies */
void event_show_spy_list(void); void event_show_spy_list(void);
#if CONFIG_IS_ENABLED(EVENT)
/** /**
* event_notify() - notify spies about an 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); int event_notify(enum event_t type, void *data, int size);
#if CONFIG_IS_ENABLED(EVENT)
/** /**
* event_notify_null() - notify spies about an 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); int event_notify_null(enum event_t type);
#else #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) static inline int event_notify_null(enum event_t type)
{ {
return 0; return 0;