all: Deprecate UTIL_LISTIFY and replace with LISTIFY

UTIL_LISTIFY is deprecated. Replacing it with LISTIFY.

Signed-off-by: Krzysztof Chruscinski <[email protected]>

Author: nordic-krch

arch/common/sw_isr_common.c

@@ -23,7 +23,7 @@ struct irq_parent_offset {
 #define INIT_IRQ_PARENT_OFFSET(i, o) { \
 	.irq = i, \
 	.offset = o, \
-},
+}
 
 #define IRQ_INDEX_TO_OFFSET(i, base) (base + i * CONFIG_MAX_IRQ_PER_AGGREGATOR)
 
@@ -33,7 +33,7 @@ struct irq_parent_offset {
 	INIT_IRQ_PARENT_OFFSET(CONFIG_2ND_LVL_INTR_0##i##_OFFSET, \
 		IRQ_INDEX_TO_OFFSET(i, base))
 static struct irq_parent_offset lvl2_irq_list[CONFIG_NUM_2ND_LEVEL_AGGREGATORS]
-	= { UTIL_LISTIFY(CONFIG_NUM_2ND_LEVEL_AGGREGATORS, CAT_2ND_LVL_LIST,
+	= { LISTIFY(CONFIG_NUM_2ND_LEVEL_AGGREGATORS, CAT_2ND_LVL_LIST, (,),
 		CONFIG_2ND_LVL_ISR_TBL_OFFSET) };
 
 #endif/* CONFIG_2ND_LEVEL_INTERRUPTS */
@@ -44,7 +44,7 @@ static struct irq_parent_offset lvl2_irq_list[CONFIG_NUM_2ND_LEVEL_AGGREGATORS]
 	INIT_IRQ_PARENT_OFFSET(CONFIG_3RD_LVL_INTR_0##i##_OFFSET, \
 		IRQ_INDEX_TO_OFFSET(i, base))
 static struct irq_parent_offset lvl3_irq_list[CONFIG_NUM_3RD_LEVEL_AGGREGATORS]
-	 = { UTIL_LISTIFY(CONFIG_NUM_3RD_LEVEL_AGGREGATORS, CAT_3RD_LVL_LIST,
+	 = { LISTIFY(CONFIG_NUM_3RD_LEVEL_AGGREGATORS, CAT_3RD_LVL_LIST, (,),
 		CONFIG_3RD_LVL_ISR_TBL_OFFSET) };
 
 #endif /* CONFIG_3RD_LEVEL_INTERRUPTS */

drivers/adc/adc_mcp320x.c

@@ -331,11 +331,11 @@ static const struct adc_driver_api mcp320x_adc_api = {
  */
 #define MCP3208_DEVICE(n) MCP320X_DEVICE(3208, n, 8)
 
-#define CALL_WITH_ARG(arg, expr) expr(arg);
+#define CALL_WITH_ARG(arg, expr) expr(arg)
 
-#define INST_DT_MCP320X_FOREACH(t, inst_expr)				\
-	UTIL_LISTIFY(DT_NUM_INST_STATUS_OKAY(microchip_mcp##t),	\
-		     CALL_WITH_ARG, inst_expr)
+#define INST_DT_MCP320X_FOREACH(t, inst_expr)			\
+	LISTIFY(DT_NUM_INST_STATUS_OKAY(microchip_mcp##t),	\
+		CALL_WITH_ARG, (;), inst_expr)
 
 INST_DT_MCP320X_FOREACH(3204, MCP3204_DEVICE);
 INST_DT_MCP320X_FOREACH(3208, MCP3208_DEVICE);

drivers/console/uart_mux.c

@@ -69,9 +69,9 @@ struct uart_mux {
 	static struct uart_mux uart_mux_##x __used			\
 		__attribute__((__section__(".uart_mux.data"))) = {	\
 			.rx_ringbuf = &uart_rx_ringbuf_##x,		\
-	};
+	}
 
-UTIL_LISTIFY(CONFIG_UART_MUX_REAL_DEVICE_COUNT, DEFINE_UART_MUX, _)
+LISTIFY(CONFIG_UART_MUX_REAL_DEVICE_COUNT, DEFINE_UART_MUX, (;), _)
 
 extern struct uart_mux __uart_mux_start[];
 extern struct uart_mux __uart_mux_end[];
@@ -869,15 +869,15 @@ void uart_mux_foreach(uart_mux_cb_t cb, void *user_data)
 
 #define DEFINE_UART_MUX_CFG_DATA(x, _)					  \
 	struct uart_mux_cfg_data uart_mux_config_##x = {		  \
-	};
+	}
 
 #define DEFINE_UART_MUX_DEV_DATA(x, _)					  \
 	RING_BUF_DECLARE(tx_ringbuf_##x, CONFIG_UART_MUX_RINGBUF_SIZE);	  \
 	RING_BUF_DECLARE(rx_ringbuf_##x, CONFIG_UART_MUX_RINGBUF_SIZE);	  \
 	static struct uart_mux_dev_data uart_mux_dev_data_##x = {	  \
 		.tx_ringbuf = &tx_ringbuf_##x,				  \
 		.rx_ringbuf = &rx_ringbuf_##x,				  \
-	};
+	}
 
 #define DEFINE_UART_MUX_DEVICE(x, _)					  \
 	DEVICE_DEFINE(uart_mux_##x,					  \
@@ -888,11 +888,11 @@ void uart_mux_foreach(uart_mux_cb_t cb, void *user_data)
 			    &uart_mux_config_##x,			  \
 			    POST_KERNEL,				  \
 			    CONFIG_CONSOLE_INIT_PRIORITY,		  \
-			    &uart_mux_driver_api);
+			    &uart_mux_driver_api)
 
-UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_CFG_DATA, _)
-UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEV_DATA, _)
-UTIL_LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEVICE, _)
+LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_CFG_DATA, (;),  _)
+LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEV_DATA, (;), _)
+LISTIFY(CONFIG_UART_MUX_DEVICE_COUNT, DEFINE_UART_MUX_DEVICE, (;), _)
 
 static int init_uart_mux(const struct device *dev)
 {

drivers/dac/dac_dacx0508.c

@@ -406,8 +406,8 @@ static const struct dac_driver_api dacx0508_driver_api = {
 #define CALL_WITH_ARG(arg, expr) expr(arg)
 
 #define INST_DT_DACX0508_FOREACH(t, inst_expr) \
-	UTIL_LISTIFY(DT_NUM_INST_STATUS_OKAY(ti_dac##t), \
-		     CALL_WITH_ARG, inst_expr)
+	LISTIFY(DT_NUM_INST_STATUS_OKAY(ti_dac##t), \
+		     CALL_WITH_ARG, (), inst_expr)
 
 INST_DT_DACX0508_FOREACH(60508, DAC60508_DEVICE);
 INST_DT_DACX0508_FOREACH(70508, DAC70508_DEVICE);

drivers/dac/dac_dacx3608.c

@@ -267,8 +267,8 @@ static const struct dac_driver_api dacx3608_driver_api = {
 #define CALL_WITH_ARG(arg, expr) expr(arg)
 
 #define INST_DT_DACX3608_FOREACH(t, inst_expr) \
-	UTIL_LISTIFY(DT_NUM_INST_STATUS_OKAY(ti_dac##t), \
-		     CALL_WITH_ARG, inst_expr)
+	LISTIFY(DT_NUM_INST_STATUS_OKAY(ti_dac##t), \
+		     CALL_WITH_ARG, (), inst_expr)
 
 INST_DT_DACX3608_FOREACH(43608, DAC43608_DEVICE);
 INST_DT_DACX3608_FOREACH(53608, DAC53608_DEVICE);

drivers/display/display_ili9xxx.c

@@ -447,10 +447,10 @@ static const struct display_driver_api ili9xxx_api = {
 	DEVICE_DT_DEFINE(INST_DT_ILI9XXX(n, t), ili9xxx_init,                  \
 			    NULL, &ili9xxx_data_##n,                           \
 			    &ili9xxx_config_##n, POST_KERNEL,                  \
-			    CONFIG_DISPLAY_INIT_PRIORITY, &ili9xxx_api);
+			    CONFIG_DISPLAY_INIT_PRIORITY, &ili9xxx_api)
 
 #define DT_INST_FOREACH_ILI9XXX_STATUS_OKAY(t)                                 \
-	UTIL_LISTIFY(DT_NUM_INST_STATUS_OKAY(ilitek_ili##t), ILI9XXX_INIT, t)
+	LISTIFY(DT_NUM_INST_STATUS_OKAY(ilitek_ili##t), ILI9XXX_INIT, (;), t)
 
 #ifdef CONFIG_ILI9340
 #include "display_ili9340.h"

drivers/display/display_nrf_led_matrix.c

@@ -535,8 +535,8 @@ static struct display_drv_data instance_data = {
 	 ((DT_GPIO_FLAGS_BY_IDX(node_id, pha, idx) & GPIO_ACTIVE_LOW) ? \
 		ACTIVE_LOW_MASK : 0)),
 
-#define ADD_FF(i, _) 0xFF,
-#define FILL_ROW_WITH_FF(node_id, pha, idx)  UTIL_LISTIFY(COL_COUNT, ADD_FF)
+#define ADD_FF(i, _) 0xFF
+#define FILL_ROW_WITH_FF(node_id, pha, idx)  LISTIFY(COL_COUNT, ADD_FF, (,)),
 #define GET_PIXEL_ORDINAL(node_id, pha, idx) \
 	[GET_DT_ROW_IDX(idx) * COL_COUNT + \
 	 GET_DT_COL_IDX(idx)] = idx,

drivers/dma/dmamux_stm32.c

@@ -53,33 +53,33 @@ struct dmamux_stm32_config {
 };
 
 /*
- * UTIL_LISTIFY is used to generate arrays with function pointers to check
+ * LISTIFY is used to generate arrays with function pointers to check
  * and clear interrupt flags using LL functions
  */
-#define DMAMUX_CHANNEL(i, _)		LL_DMAMUX_CHANNEL_ ## i,
-#define IS_ACTIVE_FLAG_SOX(i, _)	LL_DMAMUX_IsActiveFlag_SO  ## i,
-#define CLEAR_FLAG_SOX(i, _)		LL_DMAMUX_ClearFlag_SO ## i,
-#define IS_ACTIVE_FLAG_RGOX(i, _)	LL_DMAMUX_IsActiveFlag_RGO  ## i,
-#define CLEAR_FLAG_RGOX(i, _)		LL_DMAMUX_ClearFlag_RGO ## i,
+#define DMAMUX_CHANNEL(i, _)		LL_DMAMUX_CHANNEL_ ## i
+#define IS_ACTIVE_FLAG_SOX(i, _)	LL_DMAMUX_IsActiveFlag_SO  ## i
+#define CLEAR_FLAG_SOX(i, _)		LL_DMAMUX_ClearFlag_SO ## i
+#define IS_ACTIVE_FLAG_RGOX(i, _)	LL_DMAMUX_IsActiveFlag_RGO  ## i
+#define CLEAR_FLAG_RGOX(i, _)		LL_DMAMUX_ClearFlag_RGO ## i
 
 uint32_t table_ll_channel[] = {
-	UTIL_LISTIFY(DT_INST_PROP(0, dma_channels), DMAMUX_CHANNEL)
+	LISTIFY(DT_INST_PROP(0, dma_channels), DMAMUX_CHANNEL, (,))
 };
 
 uint32_t (*func_ll_is_active_so[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
-	UTIL_LISTIFY(DT_INST_PROP(0, dma_channels), IS_ACTIVE_FLAG_SOX)
+	LISTIFY(DT_INST_PROP(0, dma_channels), IS_ACTIVE_FLAG_SOX, (,))
 };
 
 void (*func_ll_clear_so[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
-	UTIL_LISTIFY(DT_INST_PROP(0, dma_channels), CLEAR_FLAG_SOX)
+	LISTIFY(DT_INST_PROP(0, dma_channels), CLEAR_FLAG_SOX, (,))
 };
 
 uint32_t (*func_ll_is_active_rgo[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
-	UTIL_LISTIFY(DT_INST_PROP(0, dma_generators), IS_ACTIVE_FLAG_RGOX)
+	LISTIFY(DT_INST_PROP(0, dma_generators), IS_ACTIVE_FLAG_RGOX, (,))
 };
 
 void (*func_ll_clear_rgo[])(DMAMUX_Channel_TypeDef *DMAMUXx) = {
-	UTIL_LISTIFY(DT_INST_PROP(0, dma_generators), CLEAR_FLAG_RGOX)
+	LISTIFY(DT_INST_PROP(0, dma_generators), CLEAR_FLAG_RGOX, (,))
 };
 
 int dmamux_stm32_configure(const struct device *dev, uint32_t id,
@@ -279,14 +279,14 @@ static const struct dma_driver_api dma_funcs = {
  * future extension.
  */
 #define INIT_DMAMUX_0_CHANNEL(x, ...) \
-	{ .dev_dma = DEV_DMA_BINDING(x), .dma_id = DMA_CHANNEL(x), },
+	{ .dev_dma = DEV_DMA_BINDING(x), .dma_id = DMA_CHANNEL(x), }
 #define INIT_DMAMUX_1_CHANNEL(x, ...) \
-	{ .dev_dma = 0, .dma_id = 0, },
+	{ .dev_dma = 0, .dma_id = 0, }
 
 #define DMAMUX_CHANNELS_INIT_0(count) \
-	UTIL_LISTIFY(count, INIT_DMAMUX_0_CHANNEL)
+	LISTIFY(count, INIT_DMAMUX_0_CHANNEL, (,))
 #define DMAMUX_CHANNELS_INIT_1(count) \
-	UTIL_LISTIFY(count, INIT_DMAMUX_1_CHANNEL)
+	LISTIFY(count, INIT_DMAMUX_1_CHANNEL, (,))
 
 
 #define DMAMUX_CLOCK_INIT(index) \

drivers/eeprom/eeprom_at2x.c

@@ -660,8 +660,8 @@ static const struct eeprom_driver_api eeprom_at2x_api = {
 #define CALL_WITH_ARG(arg, expr) expr(arg);
 
 #define INST_DT_AT2X_FOREACH(t, inst_expr) \
-	UTIL_LISTIFY(DT_NUM_INST_STATUS_OKAY(atmel_at##t),	\
-		     CALL_WITH_ARG, inst_expr)
+	LISTIFY(DT_NUM_INST_STATUS_OKAY(atmel_at##t),	\
+		CALL_WITH_ARG, (), inst_expr)
 
 #ifdef CONFIG_EEPROM_AT24
 INST_DT_AT2X_FOREACH(24, EEPROM_AT24_DEVICE);

drivers/ethernet/eth_native_posix.c

@@ -71,9 +71,9 @@ struct eth_context {
 #define DEFINE_RX_THREAD(x, _)						\
 	K_KERNEL_STACK_DEFINE(rx_thread_stack_##x,			\
 			      CONFIG_ARCH_POSIX_RECOMMENDED_STACK_SIZE);\
-	static struct k_thread rx_thread_data_##x;
+	static struct k_thread rx_thread_data_##x
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_RX_THREAD, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_RX_THREAD, (;), _);
 
 #if defined(CONFIG_NET_GPTP)
 static bool need_timestamping(struct gptp_hdr *hdr)
@@ -632,9 +632,9 @@ static const struct ethernet_api eth_if_api = {
 		.rx_thread = &rx_thread_data_##x,			     \
 		.rx_stack = rx_thread_stack_##x,			     \
 		.rx_stack_size = K_KERNEL_STACK_SIZEOF(rx_thread_stack_##x), \
-	};
+	}
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, (;), _);
 
 #define DEFINE_ETH_DEVICE(x, _)						\
 	ETH_NET_DEVICE_INIT(eth_native_posix_##x,			\
@@ -644,9 +644,9 @@ UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, _)
 			    NULL,					\
 			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
 			    &eth_if_api,				\
-			    NET_ETH_MTU);
+			    NET_ETH_MTU)
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEVICE, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEVICE, (;), _);
 
 #if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK)
 
@@ -661,9 +661,9 @@ struct ptp_context {
 };
 
 #define DEFINE_PTP_DEV_DATA(x, _) \
-	static struct ptp_context ptp_context_##x;
+	static struct ptp_context ptp_context_##x
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEV_DATA, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEV_DATA, (;), _);
 
 static int ptp_clock_set_native_posix(const struct device *clk,
 				      struct net_ptp_time *tm)
@@ -732,7 +732,7 @@ static const struct ptp_clock_driver_api api = {
 		return 0;						\
 	}
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, PTP_INIT_FUNC, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, PTP_INIT_FUNC, (), _)
 
 #define DEFINE_PTP_DEVICE(x, _)						\
 	DEVICE_DEFINE(eth_native_posix_ptp_clock_##x,			\
@@ -743,8 +743,8 @@ UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, PTP_INIT_FUNC, _)
 			    NULL,					\
 			    POST_KERNEL,				\
 			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
-			    &api);
+			    &api)
 
-UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEVICE, _)
+LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_PTP_DEVICE, (;), _);
 
 #endif /* CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK */

drivers/flash/flash_simulator.c

@@ -72,7 +72,7 @@
 	} while (0)
 
 #if (CONFIG_FLASH_SIMULATOR_STAT_PAGE_COUNT > STATS_PAGE_COUNT_THRESHOLD)
-       /* Limitation above is caused by used UTIL_REPEAT                    */
+       /* Limitation above is caused by used LISTIFY                        */
        /* Using FLASH_SIMULATOR_FLASH_PAGE_COUNT allows to avoid terrible   */
        /* error logg at the output and work with the stats module partially */
        #define FLASH_SIMULATOR_FLASH_PAGE_COUNT STATS_PAGE_COUNT_THRESHOLD
@@ -93,9 +93,9 @@ STATS_SECT_ENTRY32(flash_erase_calls)   /* calls to flash_erase() */
 STATS_SECT_ENTRY32(flash_erase_time_us) /* time spent in flash_erase() */
 /* -- per-unit statistics -- */
 /* erase cycle count for unit */
-UTIL_EVAL(UTIL_REPEAT(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_SECT_EC))
+LISTIFY(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_SECT_EC, ())
 /* number of read operations on worn out erase units */
-UTIL_EVAL(UTIL_REPEAT(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_SECT_DIRTYR))
+LISTIFY(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_SECT_DIRTYR, ())
 STATS_SECT_END;
 
 STATS_SECT_DECL(flash_sim_stats) flash_sim_stats;
@@ -109,8 +109,8 @@ STATS_NAME(flash_sim_stats, flash_write_calls)
 STATS_NAME(flash_sim_stats, flash_write_time_us)
 STATS_NAME(flash_sim_stats, flash_erase_calls)
 STATS_NAME(flash_sim_stats, flash_erase_time_us)
-UTIL_EVAL(UTIL_REPEAT(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_NAME_EC))
-UTIL_EVAL(UTIL_REPEAT(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_NAME_DIRTYR))
+LISTIFY(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_NAME_EC, ())
+LISTIFY(FLASH_SIMULATOR_FLASH_PAGE_COUNT, STATS_NAME_DIRTYR, ())
 STATS_NAME_END(flash_sim_stats);
 
 /* simulator dynamic thresholds */

drivers/ipm/ipm_nrfx_ipc.c

@@ -231,9 +231,9 @@ DEVICE_DEFINE(vipm_nrf_##_idx, "IPM_"#_idx,				\
 		    &vipm_nrf_##_idx##_driver_api)
 
 #define VIPM_DEVICE(_idx, _)						\
-	IF_ENABLED(CONFIG_IPM_MSG_CH_##_idx##_ENABLE, (VIPM_DEVICE_1(_idx);))
+	IF_ENABLED(CONFIG_IPM_MSG_CH_##_idx##_ENABLE, (VIPM_DEVICE_1(_idx)))
 
-UTIL_LISTIFY(NRFX_IPC_ID_MAX_VALUE, VIPM_DEVICE, _);
+LISTIFY(NRFX_IPC_ID_MAX_VALUE, VIPM_DEVICE, (;), _);
 
 #endif
 

drivers/lora/sx127x.c

@@ -145,10 +145,10 @@ extern DioIrqHandler *DioIrq[];
 	DT_INST_PROP_LEN(inst, dio_gpios)
 
 #define SX127X_DIO_GPIO_ELEM(idx, inst) \
-	GPIO_DT_SPEC_INST_GET_BY_IDX(inst, dio_gpios, idx),
+	GPIO_DT_SPEC_INST_GET_BY_IDX(inst, dio_gpios, idx)
 
 #define SX127X_DIO_GPIO_INIT(n) \
-	UTIL_LISTIFY(SX127X_DIO_GPIO_LEN(n), SX127X_DIO_GPIO_ELEM, n)
+	LISTIFY(SX127X_DIO_GPIO_LEN(n), SX127X_DIO_GPIO_ELEM, (,), n)
 
 static const struct gpio_dt_spec sx127x_dios[] = { SX127X_DIO_GPIO_INIT(0) };
 

include/bluetooth/gatt.h

@@ -539,9 +539,9 @@ ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
 					BT_GATT_SERVICE(attr_##_name)
 
 #define _BT_GATT_ATTRS_ARRAY_DEFINE(n, _instances, _attrs_def)	\
-	static struct bt_gatt_attr attrs_##n[] = _attrs_def(_instances[n]);
+	static struct bt_gatt_attr attrs_##n[] = _attrs_def(_instances[n])
 
-#define _BT_GATT_SERVICE_ARRAY_ITEM(_n, _) BT_GATT_SERVICE(attrs_##_n),
+#define _BT_GATT_SERVICE_ARRAY_ITEM(_n, _) BT_GATT_SERVICE(attrs_##_n)
 
 /** @def BT_GATT_SERVICE_INSTANCE_DEFINE
  *  @brief Statically define service structure array.
@@ -562,11 +562,10 @@ ssize_t bt_gatt_attr_read_service(struct bt_conn *conn,
 	_name, _instances, _instance_num, _attrs_def)			 \
 	BUILD_ASSERT(ARRAY_SIZE(_instances) == _instance_num,		 \
 		"The number of array elements does not match its size"); \
-	UTIL_EVAL(UTIL_REPEAT(						 \
-		_instance_num, _BT_GATT_ATTRS_ARRAY_DEFINE, _instances,  \
-		_attrs_def))						 \
+	LISTIFY(_instance_num, _BT_GATT_ATTRS_ARRAY_DEFINE, (;),	 \
+		_instances, _attrs_def);				 \
 	static struct bt_gatt_service _name[] = {			 \
-		UTIL_LISTIFY(_instance_num, _BT_GATT_SERVICE_ARRAY_ITEM) \
+		LISTIFY(_instance_num, _BT_GATT_SERVICE_ARRAY_ITEM, (,)) \
 	}
 
 /** @def BT_GATT_SERVICE

include/bluetooth/mesh/access.h

@@ -15,14 +15,14 @@
 #include <bluetooth/mesh/msg.h>
 
 /* Internal macros used to initialize array members */
-#define BT_MESH_KEY_UNUSED_ELT_(IDX, _) BT_MESH_KEY_UNUSED,
-#define BT_MESH_ADDR_UNASSIGNED_ELT_(IDX, _) BT_MESH_ADDR_UNASSIGNED,
+#define BT_MESH_KEY_UNUSED_ELT_(IDX, _) BT_MESH_KEY_UNUSED
+#define BT_MESH_ADDR_UNASSIGNED_ELT_(IDX, _) BT_MESH_ADDR_UNASSIGNED
 #define BT_MESH_MODEL_KEYS_UNUSED			\
-	{ UTIL_LISTIFY(CONFIG_BT_MESH_MODEL_KEY_COUNT,	\
-		       BT_MESH_KEY_UNUSED_ELT_) }
-#define BT_MESH_MODEL_GROUPS_UNASSIGNED				\
-	{ UTIL_LISTIFY(CONFIG_BT_MESH_MODEL_GROUP_COUNT,	\
-		       BT_MESH_ADDR_UNASSIGNED_ELT_) }
+	{ LISTIFY(CONFIG_BT_MESH_MODEL_KEY_COUNT,	\
+		  BT_MESH_KEY_UNUSED_ELT_, (,)) }
+#define BT_MESH_MODEL_GROUPS_UNASSIGNED			\
+	{ LISTIFY(CONFIG_BT_MESH_MODEL_GROUP_COUNT,	\
+		  BT_MESH_ADDR_UNASSIGNED_ELT_, (,)) }
 
 /**
  * @brief Access layer