diff options
author | Alexander Gordeev <lasaine@lvk.cs.msu.su> | 2011-01-12 20:00:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:20 -0500 |
commit | 12f9b1f9c11700893a7b453705d95b260d78f268 (patch) | |
tree | 49cd6a357b37d5f1e4ff02ec08192de381cc8509 /drivers/pps | |
parent | 818b9eefe742cc29c6456e163e2c035cfb431e51 (diff) |
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>
Diffstat (limited to 'drivers/pps')
-rw-r--r-- | drivers/pps/clients/pps-ldisc.c | 8 |
1 files changed, 0 insertions, 8 deletions
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, | |||
32 | struct pps_event_time *ts) | 32 | struct pps_event_time *ts) |
33 | { | 33 | { |
34 | struct pps_device *pps = (struct pps_device *)tty->disc_data; | 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 | BUG_ON(pps == NULL); | 36 | BUG_ON(pps == NULL); |
45 | 37 | ||