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>

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 27d6578772a1dd4feeb4c640e87fb027bda974d4..9b9a7148a1a48457c9d0996a7461f484ff41221e 100644 (file)
--- 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 62e72a7bd3163cb52841cbe8d7dcd849bc349938..7765f0725032f296ed0d7323380f1e31041278fa 100644 (file)
--- 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;