[PATCH] serial: amba-pl010: fix set_ldisc

[PATCH] serial: amba-pl010: fix set_ldisc

[Mika Westerberg]

Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed
set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver
according the new prototype.

Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/serial/amba-pl010.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 50441ff..2904aa0 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -472,14 +472,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
 	spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
-static void pl010_set_ldisc(struct uart_port *port)
+static void pl010_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;
 		pl010_enable_ms(port);
 	} else
-- 
1.5.6.5

Re: [PATCH] serial: amba-pl010: fix set_ldisc

[Mika Westerberg]

On Sun, Aug 29, 2010 at 08:12:45PM +0300, Mika Westerberg wrote:
> Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed
> set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver
> according the new prototype.

Hi,

If there are no objections, could this be merged? I CC'd Greg as I'm not sure
who is the serial maintainer.

Thanks,
MW

> Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
> Cc: Alan Cox <alan@linux.intel.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
>  drivers/serial/amba-pl010.c |    9 ++-------
>  1 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
> index 50441ff..2904aa0 100644
> --- a/drivers/serial/amba-pl010.c
> +++ b/drivers/serial/amba-pl010.c
> @@ -472,14 +472,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
>  	spin_unlock_irqrestore(&uap->port.lock, flags);
>  }
>  
> -static void pl010_set_ldisc(struct uart_port *port)
> +static void pl010_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;
>  		pl010_enable_ms(port);
>  	} else
> -- 
> 1.5.6.5

Re: [PATCH] serial: amba-pl010: fix set_ldisc

[Greg KH]

On Sat, Sep 04, 2010 at 10:23:23AM +0300, Mika Westerberg wrote:
> On Sun, Aug 29, 2010 at 08:12:45PM +0300, Mika Westerberg wrote:
> > Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed
> > set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver
> > according the new prototype.
> 
> Hi,
> 
> If there are no objections, could this be merged? I CC'd Greg as I'm not sure
> who is the serial maintainer.

I've been acting as the def-facto serial maintainer, so I can take it.
I'll queue it up in my tree, give me a few days till I get to it.

thanks,

greg k-h

Re: [PATCH] serial: amba-pl010: fix set_ldisc

[Mika Westerberg]

On Sat, Sep 04, 2010 at 07:38:12AM -0700, Greg KH wrote:
> 
> I've been acting as the def-facto serial maintainer, so I can take it.
> I'll queue it up in my tree, give me a few days till I get to it.

Great, thanks a lot.

Regards,
MW