[PATCH] serial: s5p: Use IS_ENABLED where appropriate

[PATCH] serial: s5p: Use IS_ENABLED where appropriate

[Mark Kettenis]

There are no SPL/TPL variants of CONFIG_CLK_EXYNOS and
CONFIG_ARCH_APPLE, so switch from CONFIG_IS_ENABLED to
IS_ENABLED.

Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---
 drivers/serial/serial_s5p.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index 4b3947e7f6..7aeb8c0f8c 100644
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -14,7 +14,7 @@
 #include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/io.h>
-#if !CONFIG_IS_ENABLED(ARCH_APPLE)
+#if !IS_ENABLED(CONFIG_ARCH_APPLE)
 #include <asm/arch/clk.h>
 #endif
 #include <asm/arch/uart.h>
@@ -116,7 +116,7 @@ int s5p_serial_setbrg(struct udevice *dev, int baudrate)
 	struct s5p_uart *const uart = plat->reg;
 	u32 uclk;
 
-#if CONFIG_IS_ENABLED(CLK_EXYNOS) || CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_CLK_EXYNOS) || IS_ENABLED(CONFIG_ARCH_APPLE)
 	struct clk clk;
 	u32 ret;
 
@@ -279,7 +279,7 @@ static inline void _debug_uart_init(void)
 	struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE);
 
 	s5p_serial_init(uart);
-#if CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_ARCH_APPLE)
 	s5p_serial_baud(uart, 4, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
 #else
 	s5p_serial_baud(uart, 1, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);
@@ -290,7 +290,7 @@ static inline void _debug_uart_putc(int ch)
 {
 	struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL(DEBUG_UART_BASE);
 
-#if CONFIG_IS_ENABLED(ARCH_APPLE)
+#if IS_ENABLED(CONFIG_ARCH_APPLE)
 	while (readl(&uart->ufstat) & S5L_TX_FIFO_FULL);
 	writel(ch, &uart->utxh);
 #else
-- 
2.39.0

Re: [PATCH] serial: s5p: Use IS_ENABLED where appropriate

[Simon Glass]

On Thu, 26 Jan 2023 at 06:44, Mark Kettenis <kettenis@openbsd.org> wrote:
>
> There are no SPL/TPL variants of CONFIG_CLK_EXYNOS and
> CONFIG_ARCH_APPLE, so switch from CONFIG_IS_ENABLED to
> IS_ENABLED.
>
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> ---
>  drivers/serial/serial_s5p.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH] serial: s5p: Use IS_ENABLED where appropriate

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

On Thu, Jan 26, 2023 at 02:44:09PM +0100, Mark Kettenis wrote:

> There are no SPL/TPL variants of CONFIG_CLK_EXYNOS and
> CONFIG_ARCH_APPLE, so switch from CONFIG_IS_ENABLED to
> IS_ENABLED.
> 
> Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]