Commit b84d0001 authored by Sam Protsenko's avatar Sam Protsenko Committed by Greg Kroah-Hartman
Browse files

tty: serial: samsung: Improve naming for common macro 



Having "_USI" suffix in EXYNOS_COMMON_SERIAL_DRV_DATA_USI() macro is
confusing. Rename it to just EXYNOS_COMMON_SERIAL_DRV_DATA() and provide
USI registers availability for all Exynos variants instead. While at it,
also convert .has_usi field type to bool, so its usage is more obvious.

Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20211005095800.2165-1-semen.protsenko@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aec079f8

drivers/tty/serial/samsung_tty.c

+5 −8
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ enum s3c24xx_port_type { 
struct s3c24xx_uart_info {

	char			*name;

	enum s3c24xx_port_type	type;

	unsigned int		has_usi;

	bool			has_usi;

	unsigned int		port_type;

	unsigned int		fifosize;

	unsigned long		rx_fifomask;
@@ -2780,7 +2780,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { 
#endif



#if defined(CONFIG_ARCH_EXYNOS)

#define EXYNOS_COMMON_SERIAL_DRV_DATA_USI(_has_usi)		\

#define EXYNOS_COMMON_SERIAL_DRV_DATA(_has_usi)			\

	.info = &(struct s3c24xx_uart_info) {			\

		.name		= "Samsung Exynos UART",	\

		.type		= TYPE_S3C6400,			\
@@ -2804,21 +2804,18 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = { 
		.has_fracval	= 1,				\

	}							\



#define EXYNOS_COMMON_SERIAL_DRV_DATA				\

	EXYNOS_COMMON_SERIAL_DRV_DATA_USI(0)



static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = {

	EXYNOS_COMMON_SERIAL_DRV_DATA,

	EXYNOS_COMMON_SERIAL_DRV_DATA(false),

	.fifosize = { 256, 64, 16, 16 },

};



static struct s3c24xx_serial_drv_data exynos5433_serial_drv_data = {

	EXYNOS_COMMON_SERIAL_DRV_DATA,

	EXYNOS_COMMON_SERIAL_DRV_DATA(false),

	.fifosize = { 64, 256, 16, 256 },

};



static struct s3c24xx_serial_drv_data exynos850_serial_drv_data = {

	EXYNOS_COMMON_SERIAL_DRV_DATA_USI(1),

	EXYNOS_COMMON_SERIAL_DRV_DATA(true),

	.fifosize = { 256, 64, 64, 64 },

};