From 53bc95e21873344f9e528ef4ddcc90310a9518ce Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 18 Sep 2023 15:58:32 -0700 Subject: [PATCH] uart: ns16550: refactor UART_NS16550_IRQ_CONFIG_* Instead of PCIE0 and PCIE1, use no suffix for IO port/MMIO IRQ configuration funct, and suffix PCIE for IRQ config on PCIE bus. Signed-off-by: Daniel Leung --- drivers/serial/uart_ns16550.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index 71b90b25f96..39b6f1dfe27 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -1225,8 +1225,8 @@ static const struct uart_driver_api uart_ns16550_driver_api = { (DT_INST_IRQ(n, sense)), \ (0)) -/* not PCI(e) */ -#define UART_NS16550_IRQ_CONFIG_PCIE0(n) \ +/* IO-port or MMIO based UART */ +#define UART_NS16550_IRQ_CONFIG(n) \ static void irq_config_func##n(const struct device *dev) \ { \ ARG_UNUSED(dev); \ @@ -1237,7 +1237,7 @@ static const struct uart_driver_api uart_ns16550_driver_api = { } /* PCI(e) with auto IRQ detection */ -#define UART_NS16550_IRQ_CONFIG_PCIE1(n) \ +#define UART_NS16550_IRQ_CONFIG_PCIE(n) \ static void irq_config_func##n(const struct device *dev) \ { \ BUILD_ASSERT(DT_INST_IRQN(n) == PCIE_IRQ_DETECT, \ @@ -1287,7 +1287,9 @@ static const struct uart_driver_api uart_ns16550_driver_api = { #define UART_NS16550_IRQ_FUNC_DECLARE(n) \ static void irq_config_func##n(const struct device *dev); #define UART_NS16550_IRQ_FUNC_DEFINE(n) \ - _CONCAT(UART_NS16550_IRQ_CONFIG_PCIE, DT_INST_ON_BUS(n, pcie))(n) + COND_CODE_1(DT_INST_ON_BUS(n, pcie), \ + (UART_NS16550_IRQ_CONFIG_PCIE(n)), \ + (UART_NS16550_IRQ_CONFIG(n))) #else /* !CONFIG_UART_INTERRUPT_DRIVEN */ #define DEV_CONFIG_IRQ_FUNC_INIT(n)