Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 12f9b1f9c11700893a7b453705d95b260d78f268

Authored by Alexander Gordeev
Committed by Linus Torvalds
1 parent 818b9eefe7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 3 changed files with 2 additions and 10 deletions Side-by-side Diff

Documentation/serial/tty.txt
Diff comments   View file @ 12f9b1f
... ... @@ -107,7 +107,7 @@
107 107  
108 108 dcd_change() - Report to the tty line the current DCD pin status
109 109 changes and the relative timestamp. The timestamp
110   - can be NULL.
  110 + cannot be NULL.
111 111  
112 112  
113 113 Driver Access
drivers/pps/clients/pps-ldisc.c
Diff comments   View file @ 12f9b1f
... ... @@ -32,14 +32,6 @@
32 32 struct pps_event_time *ts)
33 33 {
34 34 struct pps_device *pps = (struct pps_device *)tty->disc_data;
35   - struct pps_event_time __ts;
36   -
37   - /* First of all we get the time stamp... */
38   - pps_get_ts(&__ts);
39   -
40   - /* Does caller give us a timestamp? */
41   - if (!ts) /* No. Do it ourself! */
42   - ts = &__ts;
43 35  
44 36 BUG_ON(pps == NULL);
45 37  
include/linux/tty_ldisc.h
Diff comments   View file @ 12f9b1f
... ... @@ -104,7 +104,7 @@
104 104 * struct pps_event_time *ts)
105 105 *
106 106 * Tells the discipline that the DCD pin has changed its status and
107   - * the relative timestamp. Pointer ts can be NULL.
  107 + * the relative timestamp. Pointer ts cannot be NULL.
108 108 */
109 109  
110 110 #include <linux/fs.h>