Skip to content

Commit

Permalink
iio: use timespec64 based interfaces for iio_get_time_ns()
Browse files Browse the repository at this point in the history
We have replacements for all the deprecated timespec based interfaces now,
so this can finally convert iio_get_time_ns() to consistently use the
nanosecond or timespec64 based interfaces instead, avoiding the y2038
overflow.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  • Loading branch information
Arnd Bergmann authored and Jonathan Cameron committed Jun 24, 2018
1 parent 5f1d651 commit 45e7f5d
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions drivers/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,35 +208,27 @@ static int iio_device_set_clock(struct iio_dev *indio_dev, clockid_t clock_id)
*/
s64 iio_get_time_ns(const struct iio_dev *indio_dev)
{
struct timespec tp;
struct timespec64 tp;

switch (iio_device_get_clock(indio_dev)) {
case CLOCK_REALTIME:
ktime_get_real_ts(&tp);
break;
return ktime_get_real_ns();
case CLOCK_MONOTONIC:
ktime_get_ts(&tp);
break;
return ktime_get_ns();
case CLOCK_MONOTONIC_RAW:
getrawmonotonic(&tp);
break;
return ktime_get_raw_ns();
case CLOCK_REALTIME_COARSE:
tp = current_kernel_time();
break;
return ktime_to_ns(ktime_get_coarse_real());
case CLOCK_MONOTONIC_COARSE:
tp = get_monotonic_coarse();
break;
ktime_get_coarse_ts64(&tp);
return timespec64_to_ns(&tp);
case CLOCK_BOOTTIME:
get_monotonic_boottime(&tp);
break;
return ktime_get_boot_ns();
case CLOCK_TAI:
timekeeping_clocktai(&tp);
break;
return ktime_get_tai_ns();
default:
BUG();
}

return timespec_to_ns(&tp);
}
EXPORT_SYMBOL(iio_get_time_ns);

Expand Down

0 comments on commit 45e7f5d

Please sign in to comment.