2 files changed, 8 insertions, 19 deletions

diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
index e7ef5b8186d0..e1bdd8bc8c9c 100644
--- a/drivers/pps/clients/pps-ktimer.c
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -40,18 +40,13 @@ static struct timer_list ktimer;
 
 static void pps_ktimer_event(unsigned long ptr)
 {
-        struct timespec __ts;
-        struct pps_ktime ts;
+        struct pps_event_time ts;
 
         /* First of all we get the time stamp... */
-        getnstimeofday(&__ts);
+        pps_get_ts(&ts);
 
         pr_info("PPS event at %lu\n", jiffies);
 
-        /* ... and translate it to PPS time data struct */
-        ts.sec = __ts.tv_sec;
-        ts.nsec = __ts.tv_nsec;
-
         pps_event(source, &ts, PPS_CAPTUREASSERT, NULL);
 
         mod_timer(&ktimer, jiffies + HZ);
diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c
index 8e1932d29fd4..20fc9f7645c8 100644
--- a/drivers/pps/clients/pps-ldisc.c
+++ b/drivers/pps/clients/pps-ldisc.c
@@ -27,26 +27,20 @@
 #define PPS_TTY_MAGIC           0x0001
 
 static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
-                                struct timespec *ts)
+                                struct pps_event_time *ts)
 {
         int id = (long)tty->disc_data;
-        struct timespec __ts;
-        struct pps_ktime pps_ts;
+        struct pps_event_time __ts;
 
         /* First of all we get the time stamp... */
-        getnstimeofday(&__ts);
+        pps_get_ts(&__ts);
 
         /* Does caller give us a timestamp? */
-        if (ts) {       /* Yes. Let's use it! */
-                pps_ts.sec = ts->tv_sec;
-                pps_ts.nsec = ts->tv_nsec;
-        } else {        /* No. Do it ourself! */
-                pps_ts.sec = __ts.tv_sec;
-                pps_ts.nsec = __ts.tv_nsec;
-        }
+        if (!ts)        /* No. Do it ourself! */
+                ts = &__ts;
 
         /* Now do the PPS event report */
-        pps_event(id, &pps_ts, status ? PPS_CAPTUREASSERT : PPS_CAPTURECLEAR,
+        pps_event(id, ts, status ? PPS_CAPTUREASSERT : PPS_CAPTURECLEAR,
                         NULL);
 
         pr_debug("PPS %s at %lu on source #%d\n",