Skip to content

Commit f91d473

Browse files
marc-hbhenrikbrixandersen
authored andcommitted
pm: use braces for .pm_base inside anonymous union initializer
Fixes commit 25173f7 ("pm: device_runtime: Extend with synchronous runtime PM") Fixes compilation with gcc 4.2-based toolchain used by SOF for TGL generation products. As seen in the error message below, that gcc version requires braces for initialization of anonymous unions: ``` zephyr/soc/xtensa/intel_adsp/common/mem_window.c:62: error: unknown field ‘pm_base’ specified in initializer warning: missing braces around initializer warning: (near initialization for ‘__device_dts_ord_66.<anonymous>’) ``` This is a well-known and recurring issue, see past example(s) in #68118 As the Zephyr build is deterministic, I could easily verify that this commit makes zero .obj difference (when using the Zephyr SDK). Signed-off-by: Marc Herbert <[email protected]>
1 parent 18c96b6 commit f91d473

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/zephyr/device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ static inline bool z_impl_device_is_ready(const struct device *dev)
906906
.state = (state_), \
907907
.data = (data_), \
908908
IF_ENABLED(CONFIG_DEVICE_DEPS, (.deps = (deps_),)) /**/ \
909-
IF_ENABLED(CONFIG_PM_DEVICE, (.pm_base = (pm_),)) /**/ \
909+
IF_ENABLED(CONFIG_PM_DEVICE, ({ .pm_base = (pm_),)}) /**/ \
910910
}
911911

912912
/**

0 commit comments

Comments
 (0)