init: Adapt init entry section generation

The sub-prio is entirely removed, as the new macros will bring uniquely
computed priorities.

This is seamless: none of this is of public API, so no deprecation and
macro replacement is necessary at this stage.

Signed-off-by: Tomasz Bursztyka <[email protected]>

Author: tbursztyka

include/zephyr/device.h

@@ -982,17 +982,6 @@ device_get_dt_nodelabels(const struct device *dev)
 	};
 #endif  /* CONFIG_DEVICE_DT_METADATA */
 
-/**
- * @brief Init sub-priority of the device
- *
- * The sub-priority is defined by the devicetree ordinal, which ensures that
- * multiple drivers running at the same priority level run in an order that
- * respects the devicetree dependencies.
- */
-#define Z_DEVICE_INIT_SUB_PRIO(node_id)                                        \
-	COND_CODE_1(DT_NODE_EXISTS(node_id),                                   \
-		    (DT_DEP_ORD_STR_SORTABLE(node_id)), (0))
-
 /**
  * @brief Maximum device name length.
  *
@@ -1109,7 +1098,7 @@ device_get_dt_nodelabels(const struct device *dev)
 	Z_DEVICE_CHECK_INIT_LEVEL(level)                                                           \
                                                                                                    \
 	static const Z_DECL_ALIGN(struct init_entry) __used __noasan Z_INIT_ENTRY_SECTION(         \
-		level, prio, Z_DEVICE_INIT_SUB_PRIO(node_id))                                      \
+		level, prio)                                                                       \
 		Z_INIT_ENTRY_NAME(DEVICE_NAME_GET(dev_id)) = {                                     \
 			.init_fn = {COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (.dev_rw), (.dev)) = \
 					    (init_fn_)},                                           \

include/zephyr/init.h

@@ -13,6 +13,8 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
 
+#include <zephyr/sys/util_init.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -144,12 +146,10 @@ struct init_entry {
  * @brief Init entry section.
  *
  * Each init entry is placed in a section with a name crafted so that it allows
- * linker scripts to sort them according to the specified
- * level/priority/sub-priority.
+ * linker scripts to sort them according to the specified level and priority.
  */
-#define Z_INIT_ENTRY_SECTION(level, prio, sub_prio)                           \
-	__attribute__((__section__(                                           \
-		".z_init_" #level STRINGIFY(prio)"_" STRINGIFY(sub_prio)"_")))
+#define Z_INIT_ENTRY_SECTION(level, prio)                                      \
+	__attribute__((__section__(".z_init_" #level STRINGIFY(prio)"_")))
 
 
 /* Designated initializers where added to C in C99. There were added to
@@ -235,10 +235,10 @@ struct init_entry {
  *
  * @see SYS_INIT()
  */
-#define SYS_INIT_NAMED(name, init_fn_, level, prio)                                       \
-	static const Z_DECL_ALIGN(struct init_entry)                                      \
-		Z_INIT_ENTRY_SECTION(level, prio, 0) __used __noasan                      \
-		Z_INIT_ENTRY_NAME(name) = {.init_fn = {.sys = (init_fn_)},                \
+#define SYS_INIT_NAMED(name, init_fn_, level, prio)                            \
+	static const Z_DECL_ALIGN(struct init_entry)                           \
+		Z_INIT_ENTRY_SECTION(level, prio) __used __noasan              \
+		Z_INIT_ENTRY_NAME(name) = {.init_fn = {.sys = (init_fn_)},     \
 			Z_INIT_SYS_INIT_DEV_NULL}
 
 /** @} */