From 7d0e223112c1c44e0fc5549dfcbe014d59d24583 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 18 Sep 2023 15:49:33 -0700 Subject: [PATCH] uart: ns16550: simplify DEV_CONFIG_PCIE_INIT/DEV_PCIE_DECLARE Use COND_CODE_1() instead of macro trampolines. Signed-off-by: Daniel Leung --- drivers/serial/uart_ns16550.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index 65aa1c38770..e9a4398e7f8 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -1295,15 +1295,11 @@ static const struct uart_driver_api uart_ns16550_driver_api = { #define UART_NS16550_IRQ_FUNC_DEFINE(n) #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ -#define DEV_CONFIG_PCIE0(n) -#define DEV_CONFIG_PCIE1(n) DEVICE_PCIE_INST_INIT(n, pcie) #define DEV_CONFIG_PCIE_INIT(n) \ - _CONCAT(DEV_CONFIG_PCIE, DT_INST_ON_BUS(n, pcie))(n) + COND_CODE_1(DT_INST_ON_BUS(n, pcie), (DEVICE_PCIE_INST_INIT(n, pcie)), ()) -#define DEV_DECLARE_PCIE0(n) -#define DEV_DECLARE_PCIE1(n) DEVICE_PCIE_INST_DECLARE(n) #define DEV_PCIE_DECLARE(n) \ - _CONCAT(DEV_DECLARE_PCIE, DT_INST_ON_BUS(n, pcie))(n) + COND_CODE_1(DT_INST_ON_BUS(n, pcie), (DEVICE_PCIE_INST_DECLARE(n)), ()) #define DEV_DATA_FLOW_CTRL0 UART_CFG_FLOW_CTRL_NONE #define DEV_DATA_FLOW_CTRL1 UART_CFG_FLOW_CTRL_RTS_CTS