* [PATCH] iio: use timespec64 based interfaces for iio_get_time_ns()
@ 2018-06-18 15:31 Arnd Bergmann
2018-06-24 13:41 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2018-06-18 15:31 UTC (permalink / raw)
To: Jonathan Cameron
Cc: y2038, Arnd Bergmann, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Randy Dunlap, Gustavo A. R. Silva,
Matt Fornero, linux-iio, linux-kernel
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>
---
drivers/iio/industrialio-core.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 19bdf3d2962a..fcbe92c34a3d 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -207,35 +207,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);
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iio: use timespec64 based interfaces for iio_get_time_ns()
2018-06-18 15:31 [PATCH] iio: use timespec64 based interfaces for iio_get_time_ns() Arnd Bergmann
@ 2018-06-24 13:41 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2018-06-24 13:41 UTC (permalink / raw)
To: Arnd Bergmann
Cc: y2038, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, Randy Dunlap, Gustavo A. R. Silva,
Matt Fornero, linux-iio, linux-kernel
On Mon, 18 Jun 2018 17:31:36 +0200
Arnd Bergmann <arnd@arndb.de> wrote:
> 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>
Great!
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to sanity check.
Thanks
Jonathan
> ---
> drivers/iio/industrialio-core.c | 26 +++++++++-----------------
> 1 file changed, 9 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> index 19bdf3d2962a..fcbe92c34a3d 100644
> --- a/drivers/iio/industrialio-core.c
> +++ b/drivers/iio/industrialio-core.c
> @@ -207,35 +207,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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-24 13:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-18 15:31 [PATCH] iio: use timespec64 based interfaces for iio_get_time_ns() Arnd Bergmann
2018-06-24 13:41 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).