diff --git a/doc/guides/pinctrl/index.rst b/doc/guides/pinctrl/index.rst index ec08bcf762e..11a8b529454 100644 --- a/doc/guides/pinctrl/index.rst +++ b/doc/guides/pinctrl/index.rst @@ -473,7 +473,7 @@ The example below contains a complete example of a device driver that uses the #define MYDEV_DEFINE(i) \ /* Define all pinctrl configuration for instance "i" */ \ - PINCTRL_DT_INST_DEFINE(i) \ + PINCTRL_DT_INST_DEFINE(i); \ ... \ static const struct mydev_config mydev_config_##i = { \ ... \ @@ -484,7 +484,7 @@ The example below contains a complete example of a device driver that uses the ... \ \ DEVICE_DT_INST_DEFINE(i, mydev_init, NULL, &mydev_data##i, \ - &mydev_config##i, ...) + &mydev_config##i, ...); DT_INST_FOREACH_STATUS_OKAY(MYDEV_DEFINE) diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index 15a3fb054f6..a45327f8d73 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -1050,7 +1050,7 @@ static const struct adc_driver_api api_stm32_driver_api = { \ static void adc_stm32_cfg_func_##index(void); \ \ -PINCTRL_DT_INST_DEFINE(index) \ +PINCTRL_DT_INST_DEFINE(index); \ \ static const struct adc_stm32_cfg adc_stm32_cfg_##index = { \ .base = (ADC_TypeDef *)DT_INST_REG_ADDR(index), \ diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c index b3ca302f432..70e08539147 100644 --- a/drivers/can/can_stm32.c +++ b/drivers/can/can_stm32.c @@ -1131,7 +1131,7 @@ static const struct can_driver_api can_api_funcs = { static void config_can_1_irq(CAN_TypeDef *can); -PINCTRL_DT_DEFINE(DT_NODELABEL(can1)) +PINCTRL_DT_DEFINE(DT_NODELABEL(can1)); static const struct can_stm32_config can_stm32_cfg_1 = { .can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can1)), @@ -1227,7 +1227,7 @@ NET_DEVICE_INIT(socket_can_stm32_1, SOCKET_CAN_NAME_1, socket_can_init_1, static void config_can_2_irq(CAN_TypeDef *can); -PINCTRL_DT_DEFINE(DT_NODELABEL(can2)) +PINCTRL_DT_DEFINE(DT_NODELABEL(can2)); static const struct can_stm32_config can_stm32_cfg_2 = { .can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can2)), diff --git a/drivers/can/can_stm32fd.c b/drivers/can/can_stm32fd.c index 6554d90b435..8db1731abc1 100644 --- a/drivers/can/can_stm32fd.c +++ b/drivers/can/can_stm32fd.c @@ -234,7 +234,7 @@ static void config_can_##inst##_irq(void) \ #define CAN_STM32FD_CFG_INST(inst) \ \ -PINCTRL_DT_INST_DEFINE(inst) \ +PINCTRL_DT_INST_DEFINE(inst); \ \ static const struct can_stm32fd_config can_stm32fd_cfg_##inst = { \ .msg_sram = (struct can_mcan_msg_sram *) \ @@ -266,7 +266,7 @@ static const struct can_stm32fd_config can_stm32fd_cfg_##inst = { \ #define CAN_STM32FD_CFG_INST(inst) \ \ -PINCTRL_DT_INST_DEFINE(inst) \ +PINCTRL_DT_INST_DEFINE(inst); \ \ static const struct can_stm32fd_config can_stm32fd_cfg_##inst = { \ .msg_sram = (struct can_mcan_msg_sram *) \ diff --git a/drivers/dac/dac_gd32.c b/drivers/dac/dac_gd32.c index 0dcd27b77d4..538b5d4d045 100644 --- a/drivers/dac/dac_gd32.c +++ b/drivers/dac/dac_gd32.c @@ -150,7 +150,7 @@ static int dac_gd32_init(const struct device *dev) return 0; } -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static struct dac_gd32_data dac_gd32_data_0; diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c index 2892d211fc8..c36397e94e0 100644 --- a/drivers/dac/dac_stm32.c +++ b/drivers/dac/dac_stm32.c @@ -144,7 +144,7 @@ static const struct dac_driver_api api_stm32_driver_api = { #define STM32_DAC_INIT(index) \ \ -PINCTRL_DT_INST_DEFINE(index) \ +PINCTRL_DT_INST_DEFINE(index); \ \ static const struct dac_stm32_cfg dac_stm32_cfg_##index = { \ .base = (DAC_TypeDef *)DT_INST_REG_ADDR(index), \ diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c index b5e0944b178..34733820349 100644 --- a/drivers/disk/sdmmc_stm32.c +++ b/drivers/disk/sdmmc_stm32.c @@ -484,7 +484,7 @@ err_card_detect: #if DT_NODE_HAS_STATUS(DT_DRV_INST(0), okay) -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static void stm32_sdmmc_irq_config_func(const struct device *dev) { diff --git a/drivers/ethernet/eth_dwmac_stm32h7x.c b/drivers/ethernet/eth_dwmac_stm32h7x.c index 6b01e70865c..84a7bee0d7b 100644 --- a/drivers/ethernet/eth_dwmac_stm32h7x.c +++ b/drivers/ethernet/eth_dwmac_stm32h7x.c @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include "eth_dwmac_priv.h" -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static const struct pinctrl_dev_config *eth0_pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0); diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c index 4f9f3d2bb20..ba68c7ce906 100644 --- a/drivers/ethernet/eth_stm32_hal.c +++ b/drivers/ethernet/eth_stm32_hal.c @@ -1085,7 +1085,7 @@ static void eth0_irq_config(void) irq_enable(DT_INST_IRQN(0)); } -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static const struct eth_stm32_hal_dev_cfg eth0_config = { .config_func = eth0_irq_config, diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c index 41e9aaf85aa..3ab63f6d1ad 100644 --- a/drivers/flash/flash_stm32_qspi.c +++ b/drivers/flash/flash_stm32_qspi.c @@ -859,7 +859,7 @@ static void flash_stm32_qspi_irq_config_func(const struct device *dev); #define STM32_QSPI_NODE DT_INST_PARENT(0) -PINCTRL_DT_DEFINE(STM32_QSPI_NODE) +PINCTRL_DT_DEFINE(STM32_QSPI_NODE); static const struct flash_stm32_qspi_config flash_stm32_qspi_cfg = { .regs = (QUADSPI_TypeDef *)DT_REG_ADDR(STM32_QSPI_NODE), diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c index 942f1c2e8f3..dd81f98e3bb 100644 --- a/drivers/i2c/i2c_ll_stm32.c +++ b/drivers/i2c/i2c_ll_stm32.c @@ -327,7 +327,7 @@ STM32_I2C_IRQ_HANDLER_DECL(name); \ \ DEFINE_TIMINGS(name) \ \ -PINCTRL_DT_DEFINE(DT_NODELABEL(name)) \ +PINCTRL_DT_DEFINE(DT_NODELABEL(name)); \ \ static const struct i2c_stm32_config i2c_stm32_cfg_##name = { \ .i2c = (I2C_TypeDef *)DT_REG_ADDR(DT_NODELABEL(name)), \ diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c index f7d7d525ee5..57e232cc277 100644 --- a/drivers/i2s/i2s_ll_stm32.c +++ b/drivers/i2s/i2s_ll_stm32.c @@ -894,7 +894,7 @@ static const struct device *get_dev_from_tx_dma_channel(uint32_t dma_channel) \ static void i2s_stm32_irq_config_func_##index(const struct device *dev);\ \ -PINCTRL_DT_DEFINE(DT_NODELABEL(i2s##index)) \ +PINCTRL_DT_DEFINE(DT_NODELABEL(i2s##index)); \ \ static const struct i2s_stm32_cfg i2s_stm32_config_##index = { \ .i2s = (SPI_TypeDef *) DT_REG_ADDR(DT_NODELABEL(i2s##index)), \ diff --git a/drivers/memc/memc_stm32.c b/drivers/memc/memc_stm32.c index ceb59e5d50e..00acffdc27b 100644 --- a/drivers/memc/memc_stm32.c +++ b/drivers/memc/memc_stm32.c @@ -46,7 +46,7 @@ static int memc_stm32_init(const struct device *dev) return 0; } -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static const struct memc_stm32_config config = { .fmc = DT_INST_REG_ADDR(0), diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index 9abe67ab83c..a7613ad2370 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -662,7 +662,7 @@ replaced by 'st,prescaler' property in parent node, aka timers" static struct pwm_stm32_data pwm_stm32_data_##index; \ IRQ_CONFIG_FUNC(index) \ \ - PINCTRL_DT_INST_DEFINE(index) \ + PINCTRL_DT_INST_DEFINE(index); \ \ static const struct pwm_stm32_config pwm_stm32_config_##index = { \ .timer = (TIM_TypeDef *)DT_REG_ADDR(DT_INST_PARENT(index)), \ diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index c662a7984a9..1bb8378c4c9 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -1983,7 +1983,7 @@ static int uarte_nrfx_pm_action(const struct device *dev, #define UART_NRF_UARTE_DEVICE(idx) \ UARTE_INT_DRIVEN(idx); \ UARTE_ASYNC(idx); \ - IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_DEFINE(UARTE(idx)))) \ + IF_ENABLED(CONFIG_PINCTRL, (PINCTRL_DT_DEFINE(UARTE(idx));)) \ static struct uarte_nrfx_data uarte_##idx##_data = { \ UARTE_CONFIG(idx), \ IF_ENABLED(CONFIG_UART_##idx##_ASYNC, \ diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index f90b7b1f898..433ad326355 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -1688,7 +1688,7 @@ static void uart_stm32_irq_config_func_##index(const struct device *dev) \ #define STM32_UART_INIT(index) \ STM32_UART_IRQ_HANDLER_DECL(index) \ \ -PINCTRL_DT_INST_DEFINE(index) \ +PINCTRL_DT_INST_DEFINE(index); \ \ static const struct uart_stm32_config uart_stm32_cfg_##index = { \ .uconf = { \ diff --git a/drivers/serial/usart_gd32.c b/drivers/serial/usart_gd32.c index 9fcb48c0115..9c5ffe99064 100644 --- a/drivers/serial/usart_gd32.c +++ b/drivers/serial/usart_gd32.c @@ -308,7 +308,7 @@ static const struct uart_driver_api usart_gd32_driver_api = { #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ #define GD32_USART_INIT(n) \ - PINCTRL_DT_INST_DEFINE(n) \ + PINCTRL_DT_INST_DEFINE(n); \ GD32_USART_IRQ_HANDLER(n) \ static struct gd32_usart_data usart_gd32_data_##n = { \ .baud_rate = DT_INST_PROP(n, current_speed), \ diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c index 0a7c69b25f1..47a5ae01d64 100644 --- a/drivers/spi/spi_ll_stm32.c +++ b/drivers/spi/spi_ll_stm32.c @@ -941,7 +941,7 @@ static void spi_stm32_irq_config_func_##id(const struct device *dev) \ #define STM32_SPI_INIT(id) \ STM32_SPI_IRQ_HANDLER_DECL(id); \ \ -PINCTRL_DT_INST_DEFINE(id) \ +PINCTRL_DT_INST_DEFINE(id); \ \ static const struct spi_stm32_config spi_stm32_cfg_##id = { \ .spi = (SPI_TypeDef *) DT_INST_REG_ADDR(id), \ diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index 8e9f610dcbd..3ced5024228 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -61,7 +61,7 @@ LOG_MODULE_REGISTER(usb_dc_stm32); #define USB_MAXIMUM_SPEED DT_INST_PROP(0, maximum_speed) #endif -PINCTRL_DT_INST_DEFINE(0) +PINCTRL_DT_INST_DEFINE(0); static const struct pinctrl_dev_config *usb_pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(0); diff --git a/include/drivers/pinctrl.h b/include/drivers/pinctrl.h index b8a429c240a..9dea16a6507 100644 --- a/include/drivers/pinctrl.h +++ b/include/drivers/pinctrl.h @@ -240,7 +240,7 @@ struct pinctrl_dev_config { Z_PINCTRL_STATES_DEFINE(node_id) \ Z_PINCTRL_DEV_CONFIG_CONST Z_PINCTRL_DEV_CONFIG_STATIC \ struct pinctrl_dev_config Z_PINCTRL_DEV_CONFIG_NAME(node_id) = \ - Z_PINCTRL_DEV_CONFIG_INIT(node_id); + Z_PINCTRL_DEV_CONFIG_INIT(node_id) /** * @brief Define all pin control information for the given compatible index. diff --git a/tests/drivers/pinctrl/common/test_device.c b/tests/drivers/pinctrl/common/test_device.c index 827e4757751..fb8002a9abe 100644 --- a/tests/drivers/pinctrl/common/test_device.c +++ b/tests/drivers/pinctrl/common/test_device.c @@ -19,7 +19,7 @@ int test_device_init(const struct device *dev) } #define PINCTRL_DEVICE_INIT(inst) \ - PINCTRL_DT_INST_DEFINE(inst) \ + PINCTRL_DT_INST_DEFINE(inst); \ \ DEVICE_DT_INST_DEFINE(inst, test_device_init, NULL, NULL, NULL, \ POST_KERNEL, \