pps: timestamp is always passed to dcd_change()

Remove the code that gatheres timestamp in pps_tty_dcd_change() in case
passed ts parameter is NULL because it never happens in the current code.
Fix comments as well.

Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 2 insertions, 10 deletions

diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt
index 7c900507279f..540db41dfd5d 100644
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
@@ -107,7 +107,7 @@ write_wakeup()	-	May be called at any point between open and close.
 
 dcd_change()    -       Report to the tty line the current DCD pin status
                         changes and the relative timestamp. The timestamp
-                        can be NULL.
+                        cannot be NULL.
 
 
 Driver Access
diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c
index 1b3c6eda12ba..79451f2dea6a 100644
--- a/drivers/pps/clients/pps-ldisc.c
+++ b/drivers/pps/clients/pps-ldisc.c
@@ -32,14 +32,6 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
                                 struct pps_event_time *ts)
 {
         struct pps_device *pps = (struct pps_device *)tty->disc_data;
-        struct pps_event_time __ts;
-
-        /* First of all we get the time stamp... */
-        pps_get_ts(&__ts);
-
-        /* Does caller give us a timestamp? */
-        if (!ts)        /* No. Do it ourself! */
-                ts = &__ts;
 
         BUG_ON(pps == NULL);
 
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 763e061e19f1..ff7dc08696a8 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -104,7 +104,7 @@
  *                      struct pps_event_time *ts)
  *
  *      Tells the discipline that the DCD pin has changed its status and
- *      the relative timestamp. Pointer ts can be NULL.
+ *      the relative timestamp. Pointer ts cannot be NULL.
  */
 
 #include <linux/fs.h>