drivers,test: use the new DT_FOREACH_PROP_ELEM_SEP

fabiobaltieri · kartben · commit 3a66b3853e8a · 2025-02-04T09:18:55.000+01:00
Use the new DT_FOREACH_PROP_ELEM_SEP macro instead of
DEVICE_DT_GET(DT_PHANDLE_BY_IDX(...)).

Signed-off-by: Fabio Baltieri &lt;fabiobaltieri@google.com&gt;
diff --git a/doc/build/dts/zephyr-user-node.rst b/doc/build/dts/zephyr-user-node.rst
@@ -79,19 +79,16 @@ device pointers like this:
    const struct device *my_device =
    	DEVICE_DT_GET(DT_PROP(ZEPHYR_USER_NODE, handle));
 
-   #define PHANDLE_TO_DEVICE(node_id, prop, idx) \
-        DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx)),
-
    /*
     * Same thing as:
     *
     * ... *my_devices[] = {
     *         DEVICE_DT_GET(DT_NODELABEL(gpio0)),
-    *         DEVICE_DT_GET(DT_NODELABEL(gpio1)),
+    *         DEVICE_DT_GET(DT_NODELABEL(gpio1))
     * };
     */
    const struct device *my_devices[] = {
-   	DT_FOREACH_PROP_ELEM(ZEPHYR_USER_NODE, handles, PHANDLE_TO_DEVICE)
+        DT_FOREACH_PROP_ELEM_SEP(ZEPHYR_USER_NODE, handles, DEVICE_DT_GET_BY_IDX, (,))
    };
 
 GPIOs
diff --git a/drivers/ethernet/nxp_enet/eth_nxp_enet.c b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
@@ -882,9 +882,6 @@ static const struct ethernet_api api_funcs = {
 		irq_enable(DT_IRQ_BY_IDX(node_id, idx, irq));			\
 	} while (false);
 
-#define NXP_ENET_DT_PHY_DEV(node_id, phy_phandle, idx)						\
-	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, phy_phandle, idx))
-
 #if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm)) && \
 	CONFIG_ETH_NXP_ENET_USE_DTCM_FOR_DMA_BUFFER
 #define _nxp_enet_dma_desc_section __dtcm_bss_section
diff --git a/drivers/gpio/gpio_nct38xx_alert.c b/drivers/gpio/gpio_nct38xx_alert.c
@@ -157,12 +157,9 @@ static int nct38xx_alert_init(const struct device *dev)
 /* NCT38XX alert driver must be initialized after NCT38XX GPIO driver */
 BUILD_ASSERT(CONFIG_GPIO_NCT38XX_ALERT_INIT_PRIORITY > CONFIG_GPIO_NCT38XX_INIT_PRIORITY);
 
-#define NCT38XX_DEV_AND_COMMA(node_id, prop, idx)                                                  \
-	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx)),
-
 #define NCT38XX_ALERT_DEVICE_INSTANCE(inst)                                                        \
 	const struct device *nct38xx_dev_##inst[] = {                                              \
-		DT_INST_FOREACH_PROP_ELEM(inst, nct38xx_dev, NCT38XX_DEV_AND_COMMA)};              \
+		DT_INST_FOREACH_PROP_ELEM_SEP(inst, nct38xx_dev, DEVICE_DT_GET_BY_IDX, (,))};      \
 	static struct nct38xx_mfd nct38xx_mfd_##inst[DT_INST_PROP_LEN(inst, nct38xx_dev)];         \
 	static const struct nct38xx_alert_config nct38xx_alert_cfg_##inst = {                      \
 		.irq_gpio = GPIO_DT_SPEC_INST_GET(inst, irq_gpios),                                \
diff --git a/drivers/i2c/i2c_emul.c b/drivers/i2c/i2c_emul.c
@@ -312,7 +312,7 @@ static DEVICE_API(i2c, i2c_emul_api) = {
 
 #define EMUL_FORWARD_ITEM(node_id, prop, idx)                                                      \
 	{                                                                                          \
-		.bus = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx)),                       \
+		.bus = DEVICE_DT_GET_BY_IDX(node_id, prop, idx),                                   \
 		.addr = DT_PHA_BY_IDX(node_id, prop, idx, addr),                                   \
 	},
 
diff --git a/drivers/misc/devmux/devmux.c b/drivers/misc/devmux/devmux.c
@@ -148,11 +148,8 @@ static int devmux_init(struct device *const dev)
 	return 0;
 }
 
-#define DEVMUX_PHANDLE_TO_DEVICE(node_id, prop, idx)                                               \
-	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx))
-
 #define DEVMUX_PHANDLE_DEVICES(_n)                                                                 \
-	DT_INST_FOREACH_PROP_ELEM_SEP(_n, devices, DEVMUX_PHANDLE_TO_DEVICE, (,))
+	DT_INST_FOREACH_PROP_ELEM_SEP(_n, devices, DEVICE_DT_GET_BY_IDX, (,))
 
 #define DEVMUX_SELECTED(_n) DT_INST_PROP(_n, selected)
 
diff --git a/drivers/usb_c/ppc/shell.c b/drivers/usb_c/ppc/shell.c
@@ -10,7 +10,7 @@
 /** Macro used to iterate over USB-C connector and call a function if the node has PPC property */
 #define CALL_IF_HAS_PPC(usb_node, func)                                                            \
 	COND_CODE_1(DT_NODE_HAS_PROP(usb_node, ppc),                                               \
-		    (ret |= func(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(usb_node, ppc, 0)));), ())
+		    (ret |= func(DEVICE_DT_GET_BY_IDX(usb_node, ppc, 0));), ())
 
 /**
  * @brief Command that dumps registers of one or all of the PPCs
diff --git a/tests/drivers/console_switching/src/main.c b/tests/drivers/console_switching/src/main.c
@@ -13,9 +13,8 @@
 #define BUF_SIZE 32
 
 /* array of const struct device* */
-#define PHANDLE_TO_DEVICE(node_id, prop, idx) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx))
 static const struct device *devs[] = {
-	DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(devmux0), devices, PHANDLE_TO_DEVICE, (,))};
+	DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(devmux0), devices, DEVICE_DT_GET_BY_IDX, (,))};
 
 /* array of names, e.g. "euart0" */
 #define PHANDLE_TO_NAME(node_id, prop, idx) DT_NODE_FULL_NAME(DT_PHANDLE_BY_IDX(node_id, prop, idx))
diff --git a/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp b/tests/drivers/i2c/i2c_emul/src/test_forwarding_buf.cpp
@@ -13,12 +13,10 @@
 namespace
 {
 
-#define GET_TARGET_DEVICE(node_id, prop, n) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, n)),
-
 /* Get the devicetree constants */
 constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);
 constexpr const struct device *targets[FORWARD_COUNT] = {
-	DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, GET_TARGET_DEVICE)};
+	DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};
 
 ZTEST(i2c_emul_forwarding, test_write_is_forwarded)
 {
diff --git a/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp b/tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp
@@ -12,12 +12,10 @@
 namespace
 {
 
-#define GET_TARGET_DEVICE(node_id, prop, n) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, n)),
-
 /* Get the devicetree constants */
 constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);
 constexpr const struct device *targets[FORWARD_COUNT] = {
-	DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, GET_TARGET_DEVICE)};
+	DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};
 
 ZTEST(i2c_emul_forwarding, test_write_is_forwarded)
 {
diff --git a/tests/drivers/i2c/i2c_emul/src/test_fowarding_common.cpp b/tests/drivers/i2c/i2c_emul/src/test_fowarding_common.cpp
@@ -12,12 +12,10 @@
 namespace
 {
 
-#define GET_TARGET_DEVICE(node_id, prop, n) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, n)),
-
 /* Get the devicetree constants */
 constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);
 constexpr const struct device *targets[FORWARD_COUNT] = {
-	DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, GET_TARGET_DEVICE)};
+	DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};
 
 static void *i2c_emul_forwarding_setup(void)
 {
diff --git a/tests/drivers/regulator/voltage/src/main.c b/tests/drivers/regulator/voltage/src/main.c
@@ -10,14 +10,11 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/ztest.h>
 
-#define REG_INIT(node_id, prop, idx) \
-	DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx)),
-
 #define ADC_INIT(node_id, prop, idx) \
 	ADC_DT_SPEC_GET_BY_IDX(node_id, idx),
 
 static const struct device *regs[] = {
-	DT_FOREACH_PROP_ELEM(DT_NODELABEL(resources), regulators, REG_INIT)
+	DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(resources), regulators, DEVICE_DT_GET_BY_IDX, (,))
 };
 
 static const struct adc_dt_spec adc_chs[] = {

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,10 @@`
`13`	`13`	`namespace`
`14`	`14`	`{`
`15`	`15`
`16`		`-#define GET_TARGET_DEVICE(node_id, prop, n) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, n)),`
`17`		`-`
`18`	`16`	`/* Get the devicetree constants */`
`19`	`17`	`constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);`
`20`	`18`	`constexpr const struct device *targets[FORWARD_COUNT] = {`
`21`		`- DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, GET_TARGET_DEVICE)};`
	`19`	`+ DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};`
`22`	`20`
`23`	`21`	`ZTEST(i2c_emul_forwarding, test_write_is_forwarded)`
`24`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,10 @@`
`12`	`12`	`namespace`
`13`	`13`	`{`
`14`	`14`
`15`		`-#define GET_TARGET_DEVICE(node_id, prop, n) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, n)),`
`16`		`-`
`17`	`15`	`/* Get the devicetree constants */`
`18`	`16`	`constexpr const struct device *controller = DEVICE_DT_GET(CONTROLLER_LABEL);`
`19`	`17`	`constexpr const struct device *targets[FORWARD_COUNT] = {`
`20`		`- DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, GET_TARGET_DEVICE)};`
	`18`	`+ DT_FOREACH_PROP_ELEM_SEP(CONTROLLER_LABEL, forwards, DEVICE_DT_GET_BY_IDX, (,))};`
`21`	`19`
`22`	`20`	`ZTEST(i2c_emul_forwarding, test_write_is_forwarded)`
`23`	`21`	`{`