diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-06-11 19:59:16 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-06-12 10:18:45 -0400 |
commit | 889235ce2b26cdd231c7a1d6005928ec42f11637 (patch) | |
tree | b05f78d32e870c8d5bb73d12bec600aa95f29bc1 /drivers/firewire | |
parent | a9821c741c960a77a7f08491883f9cc4bffd2279 (diff) |
firewire: Use ktime_get_ts()
do_posix_clock_monotonic_gettime() is a leftover from the initial
posix timer implementation which maps to ktime_get_ts()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Link: http://lkml.kernel.org/r/20140611234607.351283464@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/core-cdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index d7d5c8af92b9..5d997a33907e 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c | |||
@@ -1214,9 +1214,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg) | |||
1214 | cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME); | 1214 | cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME); |
1215 | 1215 | ||
1216 | switch (a->clk_id) { | 1216 | switch (a->clk_id) { |
1217 | case CLOCK_REALTIME: getnstimeofday(&ts); break; | 1217 | case CLOCK_REALTIME: getnstimeofday(&ts); break; |
1218 | case CLOCK_MONOTONIC: do_posix_clock_monotonic_gettime(&ts); break; | 1218 | case CLOCK_MONOTONIC: ktime_get_ts(&ts); break; |
1219 | case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break; | 1219 | case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break; |
1220 | default: | 1220 | default: |
1221 | ret = -EINVAL; | 1221 | ret = -EINVAL; |
1222 | } | 1222 | } |