summaryrefslogtreecommitdiff
path: root/include/linux/pps_kernel.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
commit2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch)
tree2eb2819e880060486d36665113e8da5c460383fc /include/linux/pps_kernel.h
parent6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff)
parent8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff)
Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm2200
regmap: Range API changes A bunch of updates to the regmap range support, the most important ones being to rename "n_ranges" to "num_ranges" for consistency and to allow block writes to cross page boundaries, making things more transparent.
Diffstat (limited to 'include/linux/pps_kernel.h')
-rw-r--r--include/linux/pps_kernel.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index 94048547f29a..0cc45ae1afd5 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -116,5 +116,14 @@ static inline void pps_get_ts(struct pps_event_time *ts)
#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)
+{
+ ts->ts_real = timespec_sub(ts->ts_real, delta);
+#ifdef CONFIG_NTP_PPS
+ ts->ts_raw = timespec_sub(ts->ts_raw, delta);
+#endif
+}
+
#endif /* LINUX_PPS_KERNEL_H */