iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pps: Additional cleanups in uart_handle_dcd_change

Browse Source 
An extension of the previous commit, there is no semantic change
here, just fewer lines of source code.

Signed-off-by: George Spelvin <linux@horizon.com>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
George Spelvin 2013-02-10 04:44:30 -05:00 committed by Greg Kroah-Hartman
parent 593fb1ae45
commit 42381572f5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/serial/serial_core.c
View File

@ -2723,15 +2723,15 @@ EXPORT_SYMBOL(uart_match_port);
*/ */
void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
{ {
struct uart_state *state = uport->state; struct tty_port *port = &uport->state->port;
struct tty_port *port = &state->port;
struct tty_ldisc *ld = NULL;
struct tty_struct *tty = port->tty; struct tty_struct *tty = port->tty;
struct tty_ldisc *ld = tty ? tty_ldisc_ref(tty) : NULL;
if (tty) if (ld) {
ld = tty_ldisc_ref(tty); if (ld->ops->dcd_change)
if (ld && ld->ops->dcd_change)
ld->ops->dcd_change(tty, status); ld->ops->dcd_change(tty, status);
tty_ldisc_deref(ld);
}
uport->icount.dcd++; uport->icount.dcd++;
#ifdef CONFIG_HARD_PPS #ifdef CONFIG_HARD_PPS
@ -2745,9 +2745,6 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
else if (tty) else if (tty)
tty_hangup(tty); tty_hangup(tty);
} }
if (ld)
tty_ldisc_deref(ld);
} }
EXPORT_SYMBOL_GPL(uart_handle_dcd_change); EXPORT_SYMBOL_GPL(uart_handle_dcd_change);