On 04/03/2021 22:38, Hector Martin wrote:
> This simplifies the code by removing the only distinction between the
> S3C2410 and S3C2440 codepaths.
>
> Signed-off-by: Hector Martin <marcan@xxxxxxxxx>
> ---
> drivers/tty/serial/samsung_tty.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
> index 78dc6e9240fb..33b421dbeb83 100644
> --- a/drivers/tty/serial/samsung_tty.c
> +++ b/drivers/tty/serial/samsung_tty.c
> @@ -70,6 +70,7 @@ struct s3c24xx_uart_info {
> unsigned long num_clks;
> unsigned long clksel_mask;
> unsigned long clksel_shift;
> + unsigned long ucon_mask;
>
> /* uart port features */
>
> @@ -1736,14 +1737,9 @@ static void s3c24xx_serial_resetport(struct uart_port *port,
> {
> struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
> unsigned long ucon = rd_regl(port, S3C2410_UCON);
> - unsigned int ucon_mask;
>
> - ucon_mask = info->clksel_mask;
> - if (info->type == PORT_S3C2440)
> - ucon_mask |= S3C2440_UCON0_DIVMASK;
> -
> - ucon &= ucon_mask;
> - wr_regl(port, S3C2410_UCON, ucon | cfg->ucon);
> + ucon &= (info->clksel_mask | info->ucon_mask);
> + wr_regl(port, S3C2410_UCON, ucon | cfg->ucon);
This line (wr_regl()) is not related, please split it to separate
white-space cleanups.
With the change:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx>
Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxx>
Best regards,
Krzysztof
