Merge tag 'dmaengine-4.21-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-microblaze.git] / drivers / firewire / core-cdev.c

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index f058727..d8e1855 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1205,7 +1205,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
 {
        struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2;
        struct fw_card *card = client->device->card;
-       struct timespec ts = {0, 0};
+       struct timespec64 ts = {0, 0};
        u32 cycle_time;
        int ret = 0;
 
@@ -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:     ktime_get_ts(&ts);    break;
-       case CLOCK_MONOTONIC_RAW: getrawmonotonic(&ts); break;
+       case CLOCK_REALTIME:      ktime_get_real_ts64(&ts);     break;
+       case CLOCK_MONOTONIC:     ktime_get_ts64(&ts);          break;
+       case CLOCK_MONOTONIC_RAW: ktime_get_raw_ts64(&ts);      break;
        default:
                ret = -EINVAL;
        }