Commit 079119a2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12fe59f9

arch/x86/include/asm/serial.h

+4 −4
Original line number Diff line number Diff line
@@ -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								\

drivers/tty/serial/8250/8250.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE