firewire: Use ktime_get_ts()
authorThomas Gleixner <tglx@linutronix.de>
Wed, 11 Jun 2014 23:59:16 +0000 (23:59 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 12 Jun 2014 14:18:45 +0000 (16:18 +0200)
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>
drivers/firewire/core-cdev.c

index d7d5c8af92b9754fa79aa632c69d9ffc1fb27420..5d997a33907e431b895111fc27039468be244614 100644 (file)
@@ -1214,9 +1214,9 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
        cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
 
        switch (a->clk_id) {
-       case CLOCK_REALTIME:      getnstimeofday(&ts);                   break;
-       case CLOCK_MONOTONIC:     do_posix_clock_monotonic_gettime(&ts); break;
-       case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts);                  break;
+       case CLOCK_REALTIME:      getnstimeofday(&ts);  break;
+       case CLOCK_MONOTONIC:     ktime_get_ts(&ts);    break;
+       case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
        default:
                ret = -EINVAL;
        }