@@ -436,26 +436,26 @@ static DEVICE_API(dma, siwx91x_dma_api) = {
436436};
437437
438438#define SIWX91X_DMA_INIT (inst ) \
439- static UDMA_Channel_Info dma ##inst##_channel_info [DT_INST_PROP(inst, dma_channels)]; \
440- static struct dma_siwx91x_data dma ##inst##_data = { \
441- .chan_info = dma ##inst##_channel_info, \
439+ static UDMA_Channel_Info dma_channel_info_ ##inst[DT_INST_PROP(inst, dma_channels)]; \
440+ static struct dma_siwx91x_data dma_data_ ##inst = { \
441+ .chan_info = dma_channel_info_ ##inst, \
442442 }; \
443- static void siwx91x_dma ##inst##_irq_configure (void) \
443+ static void siwx91x_dma_irq_configure_ ##inst(void) \
444444 { \
445445 IRQ_CONNECT(DT_INST_IRQ(inst, irq), DT_INST_IRQ(inst, priority), siwx91x_dma_isr, \
446446 DEVICE_DT_INST_GET(inst), 0); \
447447 irq_enable(DT_INST_IRQ(inst, irq)); \
448448 } \
449- static const struct dma_siwx91x_config dma ##inst##_cfg = { \
449+ static const struct dma_siwx91x_config dma_cfg_ ##inst = { \
450450 .clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(inst)), \
451451 .clock_subsys = (clock_control_subsys_t)DT_INST_PHA(inst, clocks, clkid), \
452452 .reg = (UDMA0_Type *)DT_INST_REG_ADDR(inst), \
453453 .channels = DT_INST_PROP(inst, dma_channels), \
454454 .irq_number = DT_INST_PROP_BY_IDX(inst, interrupts, 0), \
455455 .sram_desc_addr = (RSI_UDMA_DESC_T *)DT_INST_PROP(inst, silabs_sram_desc_addr), \
456- .irq_configure = siwx91x_dma ##inst##_irq_configure, \
456+ .irq_configure = siwx91x_dma_irq_configure_ ##inst, \
457457 }; \
458- DEVICE_DT_INST_DEFINE(inst, &siwx91x_dma_init, NULL, &dma ##inst##_data , &dma ##inst##_cfg, \
458+ DEVICE_DT_INST_DEFINE(inst, &siwx91x_dma_init, NULL, &dma_data_ ##inst, &dma_cfg_ ##inst, \
459459 PRE_KERNEL_1, CONFIG_DMA_INIT_PRIORITY, &siwx91x_dma_api);
460460
461461DT_INST_FOREACH_STATUS_OKAY (SIWX91X_DMA_INIT )
0 commit comments