Commit 12f9b1f9 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Linus Torvalds

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: default avatarAlexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: default avatarRodolfo Giometti <giometti@linux.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 818b9eef
...@@ -107,7 +107,7 @@ write_wakeup() - May be called at any point between open and close. ...@@ -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 dcd_change() - Report to the tty line the current DCD pin status
changes and the relative timestamp. The timestamp changes and the relative timestamp. The timestamp
can be NULL. cannot be NULL.
Driver Access Driver Access
......
...@@ -32,14 +32,6 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status, ...@@ -32,14 +32,6 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
struct pps_event_time *ts) struct pps_event_time *ts)
{ {
struct pps_device *pps = (struct pps_device *)tty->disc_data; 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); BUG_ON(pps == NULL);
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
* struct pps_event_time *ts) * struct pps_event_time *ts)
* *
* Tells the discipline that the DCD pin has changed its status and * 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> #include <linux/fs.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment