init: drop anonymous union

It just complicates things. It is not C99 strandard, and since C11 is
not mandatory, it is better to play safe here.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

include/zephyr/device.h

@@ -1152,33 +1152,23 @@ device_get_dt_nodelabels(const struct device *dev)
 	static const Z_DECL_ALIGN(struct init_entry) __used __noasan Z_INIT_ENTRY_SECTION(         \
 		level, prio, Z_DEVICE_INIT_SUB_PRIO(node_id))                                      \
 		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_)},                                           \
-			Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id),                                  \
-	}
+			COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id),                                  \
+				    (.init_fn = { .dev_rw = init_fn_ },                            \
+				     .dev = { .dev_rw = &DEVICE_NAME_GET(dev_id)}),                \
+				    (.init_fn = { .dev = init_fn_ },                               \
+				     .dev = { .dev = &DEVICE_NAME_GET(dev_id)}))                   \
+		}
 
 #define Z_DEFER_DEVICE_INIT_ENTRY_DEFINE(node_id, dev_id, init_fn_)                                \
 	static const Z_DECL_ALIGN(struct init_entry) __used __noasan                               \
 		__attribute__((__section__(".z_deferred_init")))                                   \
 		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_)},                                           \
-			Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id),                                  \
-	}
-
-/*
- * Anonymous unions require C11. Some pre-C11 gcc versions have early support for anonymous
- * unions but they require these braces when combined with C99 designated initializers. For
- * more details see https://docs.zephyrproject.org/latest/develop/languages/cpp/
- */
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__) < 201100
-#  define Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id) { Z_DEV_ENTRY_DEV(node_id, dev_id) }
-#else
-#  define Z_DEVICE_INIT_ENTRY_DEV(node_id, dev_id)   Z_DEV_ENTRY_DEV(node_id, dev_id)
-#endif
-
-#define Z_DEV_ENTRY_DEV(node_id, dev_id)                                                           \
-	COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id), (.dev_rw), (.dev)) =  &DEVICE_NAME_GET(dev_id)
+			COND_CODE_1(Z_DEVICE_IS_MUTABLE(node_id),                                  \
+				    (.init_fn = { .dev_rw = init_fn_ },                            \
+				     .dev = { .dev_rw = &DEVICE_NAME_GET(dev_id)}),                \
+				    (.init_fn = { .dev = init_fn_ },                               \
+				     .dev = { .dev = &DEVICE_NAME_GET(dev_id)}))                   \
+		}
 
 /**
  * @brief Define a @ref device and all other required objects.

include/zephyr/init.h

@@ -112,7 +112,7 @@ struct init_entry {
 #ifdef CONFIG_DEVICE_MUTABLE
 		struct device *dev_rw;
 #endif
-	};
+	} dev;
 };
 
 /** @cond INTERNAL_HIDDEN */

kernel/init.c

@@ -304,7 +304,7 @@ bool z_sys_post_kernel;
 
 static int do_device_init(const struct init_entry *entry)
 {
-	const struct device *dev = entry->dev;
+	const struct device *dev = entry->dev.dev;
 	int rc = 0;
 
 	if (entry->init_fn.dev != NULL) {
@@ -361,7 +361,7 @@ static void z_sys_init_run_level(enum init_level level)
 	const struct init_entry *entry;
 
 	for (entry = levels[level]; entry < levels[level+1]; entry++) {
-		const struct device *dev = entry->dev;
+		const struct device *dev = entry->dev.dev;
 		int result;
 
 		sys_trace_sys_init_enter(entry, level);
@@ -382,7 +382,7 @@ int z_impl_device_init(const struct device *dev)
 	}
 
 	STRUCT_SECTION_FOREACH_ALTERNATE(_deferred_init, init_entry, entry) {
-		if (entry->dev == dev) {
+		if (entry->dev.dev == dev) {
 			return do_device_init(entry);
 		}
 	}

tests/lib/devicetree/devices/src/main.c

@@ -64,25 +64,25 @@ DEVICE_DT_DEFINE(TEST_NOLABEL, dev_init, NULL,
 ZTEST(devicetree_devices, test_init_get)
 {
 	/* Check device pointers */
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO)->dev.dev,
 		      DEVICE_DT_GET(TEST_GPIO), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_I2C)->dev.dev,
 		      DEVICE_DT_GET(TEST_I2C), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVA)->dev.dev,
 		      DEVICE_DT_GET(TEST_DEVA), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVB)->dev.dev,
 		      DEVICE_DT_GET(TEST_DEVB), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIOX)->dev.dev,
 		      DEVICE_DT_GET(TEST_GPIOX), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_DEVC)->dev.dev,
 		      DEVICE_DT_GET(TEST_DEVC), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_PARTITION)->dev.dev,
 		      DEVICE_DT_GET(TEST_PARTITION), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_GPIO_INJECTED)->dev.dev,
 		      DEVICE_DT_GET(TEST_GPIO_INJECTED), NULL);
-	zassert_equal(DEVICE_INIT_GET(manual_dev)->dev,
+	zassert_equal(DEVICE_INIT_GET(manual_dev)->dev.dev,
 		      DEVICE_GET(manual_dev), NULL);
-	zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->dev,
+	zassert_equal(DEVICE_INIT_DT_GET(TEST_NOLABEL)->dev.dev,
 		      DEVICE_DT_GET(TEST_NOLABEL), NULL);
 
 	/* Check init functions */