Merge tag 'omap-for-v3.17/soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index d7d5c8af92b9754fa79aa632c69d9ffc1fb27420..5d997a33907e431b895111fc27039468be244614 100644 (file)
--- 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)
        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;
        }