Re: [PATCH 02/10] TTY: serial, cleanup atmel_set_ldisc

[Nicolas Ferre]

On 11/09/2011 09:33 PM, Jiri Slaby :
> Current ldisc number is passed as a paramneter -- no need to dig it
> out of the tty or ldisc. So switch PPS check to that.
> 
> No tty callback can be called with port->line higher than TTY driver
> num. So remove the check.
> 
> This removes some port.tty users.
> 
> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
> Cc: Viktar Palstsiuk <viktar.palstsiuk@xxxxxxxxxxx>
> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>

> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> ---
>  drivers/tty/serial/atmel_serial.c |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 4a0f86f..6b844d4 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -1256,12 +1256,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
>  
>  static void atmel_set_ldisc(struct uart_port *port, int new)
>  {
> -	int line = port->line;
> -
> -	if (line >= port->state->port.tty->driver->num)
> -		return;
> -
> -	if (port->state->port.tty->ldisc->ops->num == N_PPS) {
> +	if (new == N_PPS) {
>  		port->flags |= UPF_HARDPPS_CD;
>  		atmel_enable_ms(port);
>  	} else {


-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/