evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

serial, x86: use UPF_* constants for flags

Browse source 
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>
This commit is contained in:
Andy Shevchenko 2015-03-11 13:52:53 +02:00 • committed by Greg Kroah-Hartman
parent 12fe59f975
commit 079119a2c7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/include/asm/serial.h
View file

@ -12,11 +12,11 @@
/* Standard COM flags (except for COM4, because of the 8514 problem) */ /* Standard COM flags (except for COM4, because of the 8514 problem) */
#ifdef CONFIG_SERIAL_DETECT_IRQ #ifdef CONFIG_SERIAL_DETECT_IRQ
# define STD_COMX_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) # define STD_COMX_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ)
# define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | 0 | ASYNC_AUTO_IRQ) # define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | 0 | UPF_AUTO_IRQ)
#else #else
# define STD_COMX_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | 0 ) # define STD_COMX_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | 0 )
# define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | 0 | 0 ) # define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF | 0 | 0 )
#endif #endif
#define SERIAL_PORT_DFNS \ #define SERIAL_PORT_DFNS \

2
drivers/tty/serial/8250/8250.h
View file

@ -53,7 +53,7 @@ struct old_serial_port {
unsigned int baud_base; unsigned int baud_base;
unsigned int port; unsigned int port;
unsigned int irq; unsigned int irq;
unsigned int flags; upf_t flags;
unsigned char hub6; unsigned char hub6;
unsigned char io_type; unsigned char io_type;
unsigned char __iomem *iomem_base; unsigned char __iomem *iomem_base;