From 0a7d4e2135a5ad9dc8250ec78eee277e91a97345 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 7 May 2020 14:09:05 -0500 Subject: [PATCH] devicetree: Change DT_FOREACH_IMPL_ to not insert semicolon Remove semicolon between instance invocations of DT_FOREACH_IMPL_ and thus DT_INST_FOREACH. This provides more flexibility to the user. This requires we fixup in tree users to add semicolon where needed. Signed-off-by: Kumar Gala --- drivers/adc/adc_nrfx_adc.c | 2 +- drivers/adc/adc_nrfx_saadc.c | 2 +- drivers/clock_control/clock_control_mcux_pcc.c | 2 +- drivers/clock_control/clock_control_rv32m1_pcc.c | 2 +- drivers/dac/dac_mcux_dac.c | 2 +- drivers/dac/dac_mcux_dac32.c | 2 +- drivers/gpio/gpio_cc32xx.c | 2 +- drivers/gpio/gpio_ht16k33.c | 2 +- drivers/gpio/gpio_intel_apl.c | 2 +- drivers/gpio/gpio_litex.c | 2 +- drivers/gpio/gpio_lmp90xxx.c | 2 +- drivers/gpio/gpio_mcp23s17.c | 2 +- drivers/i2c/i2c_gpio.c | 2 +- drivers/i2c/i2c_litex.c | 2 +- drivers/i2c/i2c_sam_twi.c | 2 +- drivers/i2c/i2c_sam_twihs.c | 2 +- drivers/i2c/i2c_sbcon.c | 2 +- drivers/i2c/i2c_sifive.c | 2 +- drivers/i2c/slave/eeprom_slave.c | 2 +- drivers/led_strip/ws2812_gpio.c | 2 +- drivers/pinmux/pinmux_rv32m1.c | 2 +- drivers/pwm/pwm_imx.c | 2 +- drivers/pwm/pwm_litex.c | 2 +- drivers/pwm/pwm_mchp_xec.c | 2 +- drivers/pwm/pwm_mcux_ftm.c | 2 +- drivers/pwm/pwm_mcux_tpm.c | 2 +- drivers/pwm/pwm_rv32m1_tpm.c | 2 +- drivers/pwm/pwm_sam.c | 2 +- drivers/pwm/pwm_sifive.c | 2 +- drivers/pwm/pwm_stm32.c | 2 +- drivers/sensor/bq274xx/bq274xx.c | 2 +- drivers/sensor/mchp_tach_xec/tach_mchp_xec.c | 2 +- drivers/serial/uart_cc13xx_cc26xx.c | 2 +- drivers/serial/uart_imx.c | 2 +- drivers/serial/uart_mcux.c | 2 +- drivers/serial/uart_mcux_flexcomm.c | 2 +- drivers/serial/uart_mcux_lpsci.c | 2 +- drivers/serial/uart_mcux_lpuart.c | 2 +- drivers/serial/uart_rv32m1_lpuart.c | 2 +- drivers/serial/uart_sam.c | 2 +- drivers/serial/uart_xlnx_ps.c | 2 +- drivers/serial/usart_sam.c | 2 +- drivers/spi/spi_cc13xx_cc26xx.c | 2 +- drivers/spi/spi_gecko.c | 2 +- drivers/spi/spi_litespi.c | 2 +- drivers/spi/spi_oc_simple.c | 2 +- drivers/spi/spi_sam.c | 2 +- drivers/spi/spi_sam0.c | 2 +- scripts/dts/gen_defines.py | 2 +- tests/lib/devicetree/src/main.c | 6 +++--- 50 files changed, 52 insertions(+), 52 deletions(-) diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c index 4452901b1ea..73c29b1907c 100644 --- a/drivers/adc/adc_nrfx_adc.c +++ b/drivers/adc/adc_nrfx_adc.c @@ -294,6 +294,6 @@ static const struct adc_driver_api adc_nrfx_driver_api = { init_adc, NULL, NULL, \ POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &adc_nrfx_driver_api) + &adc_nrfx_driver_api); DT_INST_FOREACH(ADC_INIT) diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c index e2df2409c42..c5729b242c4 100644 --- a/drivers/adc/adc_nrfx_saadc.c +++ b/drivers/adc/adc_nrfx_saadc.c @@ -437,6 +437,6 @@ static const struct adc_driver_api adc_nrfx_driver_api = { NULL, \ POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &adc_nrfx_driver_api) + &adc_nrfx_driver_api); DT_INST_FOREACH(SAADC_INIT) diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c index 64e449a706e..fce17288486 100644 --- a/drivers/clock_control/clock_control_mcux_pcc.c +++ b/drivers/clock_control/clock_control_mcux_pcc.c @@ -77,6 +77,6 @@ static const struct clock_control_driver_api mcux_pcc_api = { NULL, &mcux_pcc##inst##_config, \ PRE_KERNEL_1, \ CONFIG_KERNEL_INIT_PRIORITY_OBJECTS, \ - &mcux_pcc_api) + &mcux_pcc_api); DT_INST_FOREACH(MCUX_PCC_INIT) diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c index 44562af6525..ce6b8ccb982 100644 --- a/drivers/clock_control/clock_control_rv32m1_pcc.c +++ b/drivers/clock_control/clock_control_rv32m1_pcc.c @@ -70,6 +70,6 @@ static const struct clock_control_driver_api rv32m1_pcc_api = { NULL, &rv32m1_pcc##inst##_config, \ PRE_KERNEL_1, \ CONFIG_KERNEL_INIT_PRIORITY_OBJECTS, \ - &rv32m1_pcc_api) + &rv32m1_pcc_api); DT_INST_FOREACH(RV32M1_PCC_INIT) diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c index 0fe31d76f7d..9dbb9bd02ba 100644 --- a/drivers/dac/dac_mcux_dac.c +++ b/drivers/dac/dac_mcux_dac.c @@ -108,6 +108,6 @@ static const struct dac_driver_api mcux_dac_driver_api = { mcux_dac_init, &mcux_dac_data_##n, \ &mcux_dac_config_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\ - &mcux_dac_driver_api) + &mcux_dac_driver_api); DT_INST_FOREACH(MCUX_DAC_INIT) diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c index 217758c2d95..da3ffe854be 100644 --- a/drivers/dac/dac_mcux_dac32.c +++ b/drivers/dac/dac_mcux_dac32.c @@ -111,6 +111,6 @@ static const struct dac_driver_api mcux_dac32_driver_api = { mcux_dac32_init, &mcux_dac32_data_##n, \ &mcux_dac32_config_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\ - &mcux_dac32_driver_api) + &mcux_dac32_driver_api); DT_INST_FOREACH(MCUX_DAC32_INIT) diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c index e0a7d46b0ea..99db78e7de4 100644 --- a/drivers/gpio/gpio_cc32xx.c +++ b/drivers/gpio/gpio_cc32xx.c @@ -310,6 +310,6 @@ static const struct gpio_driver_api api_funcs = { \ GPIO_CC32XX_INIT_FUNC(n) \ \ - GPIO_CC32XX_DEVICE_INIT(n) + GPIO_CC32XX_DEVICE_INIT(n); DT_INST_FOREACH(GPIO_CC32XX_INIT) diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c index d52f2958cf3..f51fc242f06 100644 --- a/drivers/gpio/gpio_ht16k33.c +++ b/drivers/gpio/gpio_ht16k33.c @@ -215,6 +215,6 @@ static const struct gpio_driver_api gpio_ht16k33_api = { &gpio_ht16k33_##id##_data, \ &gpio_ht16k33_##id##_cfg, POST_KERNEL, \ CONFIG_GPIO_HT16K33_INIT_PRIORITY, \ - &gpio_ht16k33_api) + &gpio_ht16k33_api); DT_INST_FOREACH(GPIO_HT16K33_DEVICE) diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c index 0e8bb6c7308..d74f7273f74 100644 --- a/drivers/gpio/gpio_intel_apl.c +++ b/drivers/gpio/gpio_intel_apl.c @@ -599,7 +599,7 @@ DEVICE_AND_API_INIT(gpio_intel_apl_##n, \ &gpio_intel_apl_data_##n, \ &gpio_intel_apl_cfg_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &gpio_intel_apl_api) + &gpio_intel_apl_api); /* "sub" devices. no more than GPIO_INTEL_APL_NR_SUBDEVS of these! */ DT_INST_FOREACH(GPIO_INTEL_APL_DEV_CFG_DATA) diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c index f3ef1ed5e79..5203c110287 100644 --- a/drivers/gpio/gpio_litex.c +++ b/drivers/gpio/gpio_litex.c @@ -237,6 +237,6 @@ static const struct gpio_driver_api gpio_litex_driver_api = { POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &gpio_litex_driver_api \ - ) + ); DT_INST_FOREACH(GPIO_LITEX_INIT) diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c index 5ced970ec86..68370c0c70a 100644 --- a/drivers/gpio/gpio_lmp90xxx.c +++ b/drivers/gpio/gpio_lmp90xxx.c @@ -183,6 +183,6 @@ BUILD_ASSERT(CONFIG_GPIO_LMP90XXX_INIT_PRIORITY > &gpio_lmp90xxx_##id##_data, \ &gpio_lmp90xxx_##id##_cfg, POST_KERNEL, \ CONFIG_GPIO_LMP90XXX_INIT_PRIORITY, \ - &gpio_lmp90xxx_api) + &gpio_lmp90xxx_api); DT_INST_FOREACH(GPIO_LMP90XXX_DEVICE) diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c index bf63d59a81d..66e9db957a7 100644 --- a/drivers/gpio/gpio_mcp23s17.c +++ b/drivers/gpio/gpio_mcp23s17.c @@ -438,6 +438,6 @@ static int mcp23s17_init(struct device *dev) &mcp23s17_##inst##_config, \ POST_KERNEL, \ CONFIG_GPIO_MCP23S17_INIT_PRIORITY, \ - &api_table) + &api_table); DT_INST_FOREACH(MCP23S17_INIT) diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c index 8d5306feeeb..5b0e28629cd 100644 --- a/drivers/i2c/i2c_gpio.c +++ b/drivers/i2c/i2c_gpio.c @@ -174,6 +174,6 @@ DEVICE_AND_API_INIT(i2c_gpio_##_num, DT_INST_LABEL(_num), \ i2c_gpio_init, \ &i2c_gpio_dev_data_##_num, \ &i2c_gpio_dev_cfg_##_num, \ - PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api) + PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api); DT_INST_FOREACH(DEFINE_I2C_GPIO) diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c index e0a321f4afb..d57044f66f9 100644 --- a/drivers/i2c/i2c_litex.c +++ b/drivers/i2c/i2c_litex.c @@ -134,6 +134,6 @@ static const struct i2c_driver_api i2c_litex_driver_api = { POST_KERNEL, \ CONFIG_I2C_INIT_PRIORITY, \ &i2c_litex_driver_api \ - ) + ); DT_INST_FOREACH(I2C_LITEX_INIT) diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index f31f8aae880..eb2a2ce9174 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -367,6 +367,6 @@ static const struct i2c_driver_api i2c_sam_twi_driver_api = { &i2c_sam_twi_initialize, \ &i2c##n##_sam_data, &i2c##n##_sam_config, \ POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, \ - &i2c_sam_twi_driver_api) + &i2c_sam_twi_driver_api); DT_INST_FOREACH(I2C_TWI_SAM_INIT) diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index 18629766821..cc646363883 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -354,6 +354,6 @@ static const struct i2c_driver_api i2c_sam_twihs_driver_api = { &i2c_sam_twihs_initialize, \ &i2c##n##_sam_data, &i2c##n##_sam_config, \ POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, \ - &i2c_sam_twihs_driver_api) + &i2c_sam_twihs_driver_api); DT_INST_FOREACH(I2C_TWIHS_SAM_INIT) diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c index ae9c8cb1f4d..d0a52857f70 100644 --- a/drivers/i2c/i2c_sbcon.c +++ b/drivers/i2c/i2c_sbcon.c @@ -120,6 +120,6 @@ DEVICE_AND_API_INIT(i2c_sbcon_##_num, DT_INST_LABEL(_num), \ i2c_sbcon_init, \ &i2c_sbcon_dev_data_##_num, \ &i2c_sbcon_dev_cfg_##_num, \ - PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api) + PRE_KERNEL_2, CONFIG_I2C_INIT_PRIORITY, &api); DT_INST_FOREACH(DEFINE_I2C_SBCON) diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c index b0c3bc9ba21..d31065cdcf3 100644 --- a/drivers/i2c/i2c_sifive.c +++ b/drivers/i2c/i2c_sifive.c @@ -345,6 +345,6 @@ static struct i2c_driver_api i2c_sifive_api = { &i2c_sifive_cfg_##n, \ POST_KERNEL, \ CONFIG_I2C_INIT_PRIORITY, \ - &i2c_sifive_api) + &i2c_sifive_api); DT_INST_FOREACH(I2C_SIFIVE_INIT) diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c index c53c804c723..add51975094 100644 --- a/drivers/i2c/slave/eeprom_slave.c +++ b/drivers/i2c/slave/eeprom_slave.c @@ -227,6 +227,6 @@ static int i2c_eeprom_slave_init(struct device *dev) &i2c_eeprom_slave_##inst##_cfg, \ POST_KERNEL, \ CONFIG_I2C_SLAVE_INIT_PRIORITY, \ - &api_funcs) + &api_funcs); DT_INST_FOREACH(I2C_EEPROM_INIT) diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c index 8a411ee2c65..e350e445d3a 100644 --- a/drivers/led_strip/ws2812_gpio.c +++ b/drivers/led_strip/ws2812_gpio.c @@ -238,6 +238,6 @@ static const struct led_strip_driver_api ws2812_gpio_api = { &ws2812_gpio_##idx##_data, \ &ws2812_gpio_##idx##_cfg, POST_KERNEL, \ CONFIG_LED_STRIP_INIT_PRIORITY, \ - &ws2812_gpio_api) + &ws2812_gpio_api); DT_INST_FOREACH(WS2812_GPIO_DEVICE) diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c index 590c51d7a68..854eaf5fc9e 100644 --- a/drivers/pinmux/pinmux_rv32m1.c +++ b/drivers/pinmux/pinmux_rv32m1.c @@ -76,6 +76,6 @@ static const struct pinmux_driver_api pinmux_rv32m1_driver_api = { NULL, &pinmux_rv32m1_##n##_config, \ PRE_KERNEL_1, \ CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ - &pinmux_rv32m1_driver_api) + &pinmux_rv32m1_driver_api); DT_INST_FOREACH(PINMUX_RV32M1_INIT) diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c index 8b283be8d92..ea8425cf663 100644 --- a/drivers/pwm/pwm_imx.c +++ b/drivers/pwm/pwm_imx.c @@ -170,7 +170,7 @@ static const struct pwm_driver_api imx_pwm_driver_api = { &imx_pwm_init, &imx_pwm_data_##n, \ &imx_pwm_config_##n, POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &imx_pwm_driver_api) + &imx_pwm_driver_api); #if DT_HAS_COMPAT(fsl_imx7d_pwm) #define DT_DRV_COMPAT fsl_imx7d_pwm diff --git a/drivers/pwm/pwm_litex.c b/drivers/pwm/pwm_litex.c index 000dee714a1..737e1bf79c5 100644 --- a/drivers/pwm/pwm_litex.c +++ b/drivers/pwm/pwm_litex.c @@ -111,6 +111,6 @@ static const struct pwm_driver_api pwm_litex_driver_api = { POST_KERNEL, \ CONFIG_PWM_LITEX_INIT_PRIORITY, \ &pwm_litex_driver_api \ - ) + ); DT_INST_FOREACH(PWM_LITEX_INIT) diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c index c644412e866..88cbf39c74b 100644 --- a/drivers/pwm/pwm_mchp_xec.c +++ b/drivers/pwm/pwm_mchp_xec.c @@ -394,6 +394,6 @@ static struct pwm_driver_api pwm_xec_api = { &pwm_xec_dev_config_##inst, \ POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &pwm_xec_api) + &pwm_xec_api); DT_INST_FOREACH(XEC_INST_INIT) diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c index 22ddcef4f17..1606c96318a 100644 --- a/drivers/pwm/pwm_mcux_ftm.c +++ b/drivers/pwm/pwm_mcux_ftm.c @@ -170,6 +170,6 @@ static const struct pwm_driver_api mcux_ftm_driver_api = { &mcux_ftm_init, &mcux_ftm_data_##n, \ &mcux_ftm_config_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &mcux_ftm_driver_api) + &mcux_ftm_driver_api); DT_INST_FOREACH(FTM_DEVICE); diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c index 5f7469aee69..1af286d8cc7 100644 --- a/drivers/pwm/pwm_mcux_tpm.c +++ b/drivers/pwm/pwm_mcux_tpm.c @@ -199,6 +199,6 @@ static const struct pwm_driver_api mcux_tpm_driver_api = { &mcux_tpm_init, &mcux_tpm_data_##n, \ &mcux_tpm_config_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &mcux_tpm_driver_api) + &mcux_tpm_driver_api); DT_INST_FOREACH(TPM_DEVICE) diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c index 538b7a427c3..31c0a02792e 100644 --- a/drivers/pwm/pwm_rv32m1_tpm.c +++ b/drivers/pwm/pwm_rv32m1_tpm.c @@ -198,6 +198,6 @@ static const struct pwm_driver_api rv32m1_tpm_driver_api = { &rv32m1_tpm_init, &rv32m1_tpm_data_##n, \ &rv32m1_tpm_config_##n, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &rv32m1_tpm_driver_api) + &rv32m1_tpm_driver_api); DT_INST_FOREACH(TPM_DEVICE) diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c index 96de4715f25..f6df02de7a6 100644 --- a/drivers/pwm/pwm_sam.c +++ b/drivers/pwm/pwm_sam.c @@ -111,6 +111,6 @@ static const struct pwm_driver_api sam_pwm_driver_api = { NULL, &sam_pwm_config_##inst, \ POST_KERNEL, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ - &sam_pwm_driver_api) + &sam_pwm_driver_api); DT_INST_FOREACH(SAM_INST_INIT) diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c index 5fff9db1ef2..64b054f2976 100644 --- a/drivers/pwm/pwm_sifive.c +++ b/drivers/pwm/pwm_sifive.c @@ -244,6 +244,6 @@ static const struct pwm_driver_api pwm_sifive_api = { &pwm_sifive_cfg_##n, \ POST_KERNEL, \ CONFIG_PWM_SIFIVE_INIT_PRIORITY, \ - &pwm_sifive_api) + &pwm_sifive_api); DT_INST_FOREACH(PWM_SIFIVE_INIT) diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index 7283136bcc3..3f10eda0b06 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -273,6 +273,6 @@ static int pwm_stm32_init(struct device *dev) &pwm_stm32_dev_data_##index, \ &pwm_stm32_dev_cfg_##index, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\ - &pwm_stm32_drv_api_funcs) + &pwm_stm32_drv_api_funcs); DT_INST_FOREACH(PWM_DEVICE_INIT_STM32) diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c index 5c343207997..f98f98abfae 100644 --- a/drivers/sensor/bq274xx/bq274xx.c +++ b/drivers/sensor/bq274xx/bq274xx.c @@ -628,6 +628,6 @@ static const struct sensor_driver_api bq274xx_battery_driver_api = { &bq274xx_gauge_init, &bq274xx_driver_##index, \ &bq274xx_config_##index, POST_KERNEL, \ CONFIG_SENSOR_INIT_PRIORITY, \ - &bq274xx_battery_driver_api) \ + &bq274xx_battery_driver_api); DT_INST_FOREACH(BQ274XX_INIT) diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c index f11908ecba6..7a1e04ba4fe 100644 --- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c +++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c @@ -131,6 +131,6 @@ static const struct sensor_driver_api tach_xec_driver_api = { &tach_xec_dev_config##id, \ POST_KERNEL, \ CONFIG_SENSOR_INIT_PRIORITY, \ - &tach_xec_driver_api) \ + &tach_xec_driver_api); DT_INST_FOREACH(TACH_XEC_DEVICE) diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index 401cb17c7dd..a492ebf77a7 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -655,6 +655,6 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = { UART_CC13XX_CC26XX_INT_FIELDS \ }; \ \ - UART_CC13XX_CC26XX_DEVICE_INIT(n) + UART_CC13XX_CC26XX_DEVICE_INIT(n); DT_INST_FOREACH(UART_CC13XX_CC26XX_INIT) diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c index 06de13c3475..027bc04aaa0 100644 --- a/drivers/serial/uart_imx.c +++ b/drivers/serial/uart_imx.c @@ -324,6 +324,6 @@ static const struct uart_driver_api uart_imx_driver_api = { \ UART_IMX_CONFIG_FUNC(n) \ \ - UART_IMX_INIT_CFG(n) + UART_IMX_INIT_CFG(n); DT_INST_FOREACH(UART_IMX_INIT) diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c index 1de5315da4c..c257201287a 100644 --- a/drivers/serial/uart_mcux.c +++ b/drivers/serial/uart_mcux.c @@ -338,6 +338,6 @@ static const struct uart_mcux_config uart_mcux_##n##_config = { \ \ UART_MCUX_CONFIG_FUNC(n) \ \ - UART_MCUX_INIT_CFG(n) + UART_MCUX_INIT_CFG(n); DT_INST_FOREACH(UART_MCUX_INIT) diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c index 50ca9eb8827..14ea6592db0 100644 --- a/drivers/serial/uart_mcux_flexcomm.c +++ b/drivers/serial/uart_mcux_flexcomm.c @@ -333,6 +333,6 @@ static const struct mcux_flexcomm_config mcux_flexcomm_##n##_config = { \ \ UART_MCUX_FLEXCOMM_CONFIG_FUNC(n) \ \ - UART_MCUX_FLEXCOMM_INIT_CFG(n) + UART_MCUX_FLEXCOMM_INIT_CFG(n); DT_INST_FOREACH(UART_MCUX_FLEXCOMM_INIT) diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c index 716b79103e5..1206f73c14e 100644 --- a/drivers/serial/uart_mcux_lpsci.c +++ b/drivers/serial/uart_mcux_lpsci.c @@ -330,6 +330,6 @@ static const struct mcux_lpsci_config mcux_lpsci_##n##_config = { \ \ MCUX_LPSCI_CONFIG_FUNC(n) \ \ - MCUX_LPSCI_INIT_CFG(n) + MCUX_LPSCI_INIT_CFG(n); DT_INST_FOREACH(MCUX_LPSCI_INIT) diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c index f41f23cb9ce..09ed874589f 100644 --- a/drivers/serial/uart_mcux_lpuart.c +++ b/drivers/serial/uart_mcux_lpuart.c @@ -338,6 +338,6 @@ static const struct mcux_lpuart_config mcux_lpuart_##n##_config = { \ \ LPUART_MCUX_CONFIG_FUNC(n) \ \ - LPUART_MCUX_INIT_CFG(n) + LPUART_MCUX_INIT_CFG(n); DT_INST_FOREACH(LPUART_MCUX_INIT) diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c index f354d0d2cb2..c81276a3a05 100644 --- a/drivers/serial/uart_rv32m1_lpuart.c +++ b/drivers/serial/uart_rv32m1_lpuart.c @@ -344,6 +344,6 @@ static const struct uart_driver_api rv32m1_lpuart_driver_api = { \ RV32M1_LPUART_CONFIG_FUNC(n) \ \ - RV32M1_LPUART_INIT_CFG(n) + RV32M1_LPUART_INIT_CFG(n); DT_INST_FOREACH(RV32M1_LPUART_INIT) diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c index 9bcaa02a560..69add863b7c 100644 --- a/drivers/serial/uart_sam.c +++ b/drivers/serial/uart_sam.c @@ -369,6 +369,6 @@ static const struct uart_driver_api uart_sam_driver_api = { \ UART_SAM_CONFIG_FUNC(n) \ \ - UART_SAM_INIT_CFG(n) + UART_SAM_INIT_CFG(n); DT_INST_FOREACH(UART_SAM_INIT) diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c index 3a5fe9fd061..93e9e3d241f 100644 --- a/drivers/serial/uart_xlnx_ps.c +++ b/drivers/serial/uart_xlnx_ps.c @@ -1217,6 +1217,6 @@ DEVICE_AND_API_INIT(uart_xlnx_ps_##port, DT_INST_LABEL(port), \ UART_XLNX_PS_IRQ_CONF_FUNC(inst); \ UART_XLNX_PS_DEV_DATA(inst); \ UART_XLNX_PS_DEV_CFG(inst); \ - UART_XLNX_PS_INIT(inst) + UART_XLNX_PS_INIT(inst); DT_INST_FOREACH(UART_XLNX_INSTANTIATE) diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c index efcd04b3cca..f5c4d4def28 100644 --- a/drivers/serial/usart_sam.c +++ b/drivers/serial/usart_sam.c @@ -370,6 +370,6 @@ static const struct uart_driver_api usart_sam_driver_api = { \ USART_SAM_CONFIG_FUNC(n) \ \ - USART_SAM_INIT_CFG(n) + USART_SAM_INIT_CFG(n); DT_INST_FOREACH(USART_SAM_INIT) diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index 12c223a976a..4fe271ddc88 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -370,6 +370,6 @@ static const struct spi_driver_api spi_cc13xx_cc26xx_driver_api = { SPI_CONTEXT_INIT_SYNC(spi_cc13xx_cc26xx_data_##n, ctx), \ }; \ \ - SPI_CC13XX_CC26XX_DEVICE_INIT(n) + SPI_CC13XX_CC26XX_DEVICE_INIT(n); DT_INST_FOREACH(SPI_CC13XX_CC26XX_INIT) diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c index 85dbcbb0b96..2a90a1a68c2 100644 --- a/drivers/spi/spi_gecko.c +++ b/drivers/spi/spi_gecko.c @@ -315,7 +315,7 @@ static struct spi_driver_api spi_gecko_api = { &spi_gecko_cfg_##n, \ POST_KERNEL, \ CONFIG_SPI_INIT_PRIORITY, \ - &spi_gecko_api) + &spi_gecko_api); #define SPI_ID(n) DT_INST_PROP(n, peripheral_id) diff --git a/drivers/spi/spi_litespi.c b/drivers/spi/spi_litespi.c index c72187cdaa0..1c3a8851e6d 100644 --- a/drivers/spi/spi_litespi.c +++ b/drivers/spi/spi_litespi.c @@ -180,6 +180,6 @@ static struct spi_driver_api spi_litespi_api = { &spi_litespi_cfg_##n, \ POST_KERNEL, \ CONFIG_SPI_INIT_PRIORITY, \ - &spi_litespi_api) + &spi_litespi_api); DT_INST_FOREACH(SPI_INIT) diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c index 8c93b1d987f..f62b37abe19 100644 --- a/drivers/spi/spi_oc_simple.c +++ b/drivers/spi/spi_oc_simple.c @@ -220,6 +220,6 @@ int spi_oc_simple_init(struct device *dev) &spi_oc_simple_cfg_##inst, \ POST_KERNEL, \ CONFIG_SPI_INIT_PRIORITY, \ - &spi_oc_simple_api) + &spi_oc_simple_api); DT_INST_FOREACH(SPI_OC_INIT) diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c index 107da954bae..8e52b0338d8 100644 --- a/drivers/spi/spi_sam.c +++ b/drivers/spi/spi_sam.c @@ -471,6 +471,6 @@ static const struct spi_driver_api spi_sam_driver_api = { DT_INST_LABEL(n), \ &spi_sam_init, &spi_sam_dev_data_##n, \ &spi_sam_config_##n, POST_KERNEL, \ - CONFIG_SPI_INIT_PRIORITY, &spi_sam_driver_api) + CONFIG_SPI_INIT_PRIORITY, &spi_sam_driver_api); DT_INST_FOREACH(SPI_SAM_DEVICE_INIT) diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c index 9107b1a1b8b..933400f32a9 100644 --- a/drivers/spi/spi_sam0.c +++ b/drivers/spi/spi_sam0.c @@ -768,6 +768,6 @@ static const struct spi_sam0_config spi_sam0_config_##n = { \ &spi_sam0_init, &spi_sam0_dev_data_##n, \ &spi_sam0_config_##n, POST_KERNEL, \ CONFIG_SPI_INIT_PRIORITY, \ - &spi_sam0_driver_api) + &spi_sam0_driver_api); DT_INST_FOREACH(SPI_SAM0_DEVICE_INIT) diff --git a/scripts/dts/gen_defines.py b/scripts/dts/gen_defines.py index 2b5dd74532a..bacdc5e853a 100755 --- a/scripts/dts/gen_defines.py +++ b/scripts/dts/gen_defines.py @@ -556,7 +556,7 @@ def write_global_compat_info(edt): "\n") for numinsts in range(1, max(compat2numinst.values(), default=0) + 1): out_define(f"DT_FOREACH_IMPL_{numinsts}(fn)", - " ".join([f"fn({i});" for i in range(numinsts)])) + " ".join([f"fn({i})" for i in range(numinsts)])) out_comment("Macros for enabled instances of each compatible\n") n_inst_macros = {} diff --git a/tests/lib/devicetree/src/main.c b/tests/lib/devicetree/src/main.c index 89d95da1e31..e7eb4356726 100644 --- a/tests/lib/devicetree/src/main.c +++ b/tests/lib/devicetree/src/main.c @@ -1179,9 +1179,9 @@ static const struct gpio_driver_api test_api; &gpio_info_##num, \ POST_KERNEL, \ CONFIG_APPLICATION_INIT_PRIORITY, \ - &test_api) + &test_api); -DT_INST_FOREACH(TEST_GPIO_INIT); +DT_INST_FOREACH(TEST_GPIO_INIT) static inline struct test_gpio_data *to_data(struct device *dev) { @@ -1227,7 +1227,7 @@ static void test_devices(void) * using macros with side effects in the current scope. */ #undef SET_BIT -#define SET_BIT(i) do { unsigned int bit = BIT(i); val |= bit; } while (0) +#define SET_BIT(i) do { unsigned int bit = BIT(i); val |= bit; } while (0); val = 0; DT_INST_FOREACH(SET_BIT); zassert_equal(val, 0x3, "foreach vnd_gpio");