Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Link: https://lore.kernel.org/r/20211005095800.2165-1-semen.protsenko@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Sam Protsenko and committed by
Greg Kroah-Hartman
b84d0001 aec079f8

+5 -8
+5 -8
drivers/tty/serial/samsung_tty.c
··· 65 65 struct s3c24xx_uart_info { 66 66 char *name; 67 67 enum s3c24xx_port_type type; 68 - unsigned int has_usi; 68 + bool has_usi; 69 69 unsigned int port_type; 70 70 unsigned int fifosize; 71 71 unsigned long rx_fifomask; ··· 2780 2780 #endif 2781 2781 2782 2782 #if defined(CONFIG_ARCH_EXYNOS) 2783 - #define EXYNOS_COMMON_SERIAL_DRV_DATA_USI(_has_usi) \ 2783 + #define EXYNOS_COMMON_SERIAL_DRV_DATA(_has_usi) \ 2784 2784 .info = &(struct s3c24xx_uart_info) { \ 2785 2785 .name = "Samsung Exynos UART", \ 2786 2786 .type = TYPE_S3C6400, \ ··· 2804 2804 .has_fracval = 1, \ 2805 2805 } \ 2806 2806 2807 - #define EXYNOS_COMMON_SERIAL_DRV_DATA \ 2808 - EXYNOS_COMMON_SERIAL_DRV_DATA_USI(0) 2809 - 2810 2807 static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = { 2811 - EXYNOS_COMMON_SERIAL_DRV_DATA, 2808 + EXYNOS_COMMON_SERIAL_DRV_DATA(false), 2812 2809 .fifosize = { 256, 64, 16, 16 }, 2813 2810 }; 2814 2811 2815 2812 static struct s3c24xx_serial_drv_data exynos5433_serial_drv_data = { 2816 - EXYNOS_COMMON_SERIAL_DRV_DATA, 2813 + EXYNOS_COMMON_SERIAL_DRV_DATA(false), 2817 2814 .fifosize = { 64, 256, 16, 256 }, 2818 2815 }; 2819 2816 2820 2817 static struct s3c24xx_serial_drv_data exynos850_serial_drv_data = { 2821 - EXYNOS_COMMON_SERIAL_DRV_DATA_USI(1), 2818 + EXYNOS_COMMON_SERIAL_DRV_DATA(true), 2822 2819 .fifosize = { 256, 64, 64, 64 }, 2823 2820 }; 2824 2821