pps: Move timestamp read into PPS code proper

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / serial_core.c

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index ca98a3f65fe1ffc77a8a26f886ffec1aa51e02c7..765be520cd2e57b672145485a0e4d21b5ac1f215 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2726,13 +2726,12 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
        struct uart_state *state = uport->state;
        struct tty_port *port = &state->port;
        struct tty_ldisc *ld = NULL;
-       struct pps_event_time ts;
        struct tty_struct *tty = port->tty;
 
        if (tty)
                ld = tty_ldisc_ref(tty);
        if (ld && ld->ops->dcd_change)
-               pps_get_ts(&ts);
+               ld->ops->dcd_change(tty, status);
 
        uport->icount.dcd++;
 #ifdef CONFIG_HARD_PPS
@@ -2747,8 +2746,6 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
                        tty_hangup(tty);
        }
 
-       if (ld && ld->ops->dcd_change)
-               ld->ops->dcd_change(tty, status, &ts);
        if (ld)
                tty_ldisc_deref(ld);
 }