Skip to contentSkip to conversation

serial: ns16550: Fix an "unused" warning with SERIAL_PRESENT=n and OF_REAL=y

PATCH In review Tom Rini 1 participant 2 messages Mar 23 – Apr 7

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 serial: ns16550: Fix an "unused" warning with SERIAL_PRESENT=n and OF_REAL=y

The definition of our ID table is guarded with OF_REAL however the U_BOOT_DRIVER that would in turn use the table is guarded with SERIAL_PRESENT. To avoid a potential warning we must also guard the ID table with SERIAL_PRESENT.

---
 drivers/serial/ns16550.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/serial/ns16550.c +1 -2
index 2f24f47badfd..10271f46aa63 100644
@@ -586,6 +586,7 @@ const struct dm_serial_ops ns16550_serial_ops = {
 	.getinfo = ns16550_serial_getinfo,
 };
 
+#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 #if CONFIG_IS_ENABLED(OF_REAL)
 /*
  * Please consider existing compatible strings before adding a new
@@ -603,8 +604,6 @@ static const struct udevice_id ns16550_serial_ids[] = {
 };
 #endif /* OF_REAL */
 
-#if CONFIG_IS_ENABLED(SERIAL_PRESENT)
-
 /* TODO([email protected]): Integrate this into a macro like CONFIG_IS_ENABLED */
 #if !defined(CONFIG_TPL_BUILD) || defined(CONFIG_TPL_DM_SERIAL)
 U_BOOT_DRIVER(ns16550_serial) = {
Signature · 1 line
2.43.0
author
#1 lore raw
Quoted 6 lines · Tom Rini

The definition of our ID table is guarded with OF_REAL however the U_BOOT_DRIVER that would in turn use the table is guarded with SERIAL_PRESENT. To avoid a potential warning we must also guard the ID table with SERIAL_PRESENT.

Applied to u-boot/master, thanks!

[1/1] serial: ns16550: Fix an "unused" warning with SERIAL_PRESENT=n and OF_REAL=y

      commit: 25d55485dbced189f8d0400fb0da58b19e196662
Signature · 1 line
Tom