1 files changed, 8 insertions, 13 deletions

diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index b2fbd62ab18d..54bf1484d41f 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -48,9 +48,9 @@ struct pps_source_info {
 
 struct pps_event_time {
 #ifdef CONFIG_NTP_PPS
-        struct timespec ts_raw;
+        struct timespec64 ts_raw;
 #endif /* CONFIG_NTP_PPS */
-        struct timespec ts_real;
+        struct timespec64 ts_real;
 };
 
 /* The main struct */
@@ -105,7 +105,7 @@ extern void pps_event(struct pps_device *pps,
 struct pps_device *pps_lookup_dev(void const *cookie);
 
 static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
-                struct timespec ts)
+                struct timespec64 ts)
 {
         kt->sec = ts.tv_sec;
         kt->nsec = ts.tv_nsec;
@@ -115,29 +115,24 @@ static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
 
 static inline void pps_get_ts(struct pps_event_time *ts)
 {
-        struct timespec64 raw, real;
-
-        ktime_get_raw_and_real_ts64(&raw, &real);
-
-        ts->ts_raw = timespec64_to_timespec(raw);
-        ts->ts_real = timespec64_to_timespec(real);
+        ktime_get_raw_and_real_ts64(&ts->ts_raw, &ts->ts_real);
 }
 
 #else /* CONFIG_NTP_PPS */
 
 static inline void pps_get_ts(struct pps_event_time *ts)
 {
-        getnstimeofday(&ts->ts_real);
+        ktime_get_real_ts64(&ts->ts_real);
 }
 
 #endif /* CONFIG_NTP_PPS */
 
 /* Subtract known time delay from PPS event time(s) */
-static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec delta)
+static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec64 delta)
 {
-        ts->ts_real = timespec_sub(ts->ts_real, delta);
+        ts->ts_real = timespec64_sub(ts->ts_real, delta);
 #ifdef CONFIG_NTP_PPS
-        ts->ts_raw = timespec_sub(ts->ts_raw, delta);
+        ts->ts_raw = timespec64_sub(ts->ts_raw, delta);
 #endif
 }