serial, x86: use UPF_* constants for flags

This patch fixes the following sparse warnings:

drivers/tty/serial/8250/8250_core.c:3231:32: warning: incorrect type in assignment (different base types)
drivers/tty/serial/8250/8250_core.c:3231:32:    expected restricted upf_t [usertype] flags
drivers/tty/serial/8250/8250_core.c:3231:32:    got unsigned int const [unsigned] flags

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/include/asm/serial.h b/arch/x86/include/asm/serial.h
index 460b84f64556dded375c779a59d2c6a521c575c7..8378b8c9109c851c3c7d1b6669e6bf0e9be689bf 100644 (file)
--- a/arch/x86/include/asm/serial.h
+++ b/arch/x86/include/asm/serial.h
@@ -12,11 +12,11 @@
 
 /* Standard COM flags (except for COM4, because of the 8514 problem) */
 #ifdef CONFIG_SERIAL_DETECT_IRQ
-# define STD_COMX_FLAGS        (ASYNC_BOOT_AUTOCONF |  ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-# define STD_COM4_FLAGS        (ASYNC_BOOT_AUTOCONF |  0               | ASYNC_AUTO_IRQ)
+# define STD_COMX_FLAGS        (UPF_BOOT_AUTOCONF |    UPF_SKIP_TEST   | UPF_AUTO_IRQ)
+# define STD_COM4_FLAGS        (UPF_BOOT_AUTOCONF |    0               | UPF_AUTO_IRQ)
 #else
-# define STD_COMX_FLAGS        (ASYNC_BOOT_AUTOCONF |  ASYNC_SKIP_TEST | 0             )
-# define STD_COM4_FLAGS        (ASYNC_BOOT_AUTOCONF |  0               | 0             )
+# define STD_COMX_FLAGS        (UPF_BOOT_AUTOCONF |    UPF_SKIP_TEST   | 0             )
+# define STD_COM4_FLAGS        (UPF_BOOT_AUTOCONF |    0               | 0             )
 #endif
 
 #define SERIAL_PORT_DFNS                                                               \

diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index b00836851061e099d517a3600b838b572ef8743d..656ecc60b5b262df9118512752e654bf5f048f0e 100644 (file)
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -53,7 +53,7 @@ struct old_serial_port {
        unsigned int baud_base;
        unsigned int port;
        unsigned int irq;
-       unsigned int flags;
+       upf_t        flags;
        unsigned char hub6;
        unsigned char io_type;
        unsigned char __iomem *iomem_base;