2018-06-18 14:23:44

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] ptp: replace getnstimeofday64() with ktime_get_real_ts64()

getnstimeofday64() is deprecated and getting replaced throughout
the kernel with ktime_get_*() based helpers for a more consistent
interface.

The two functions do the exact same thing, so this is just
a cosmetic change.

Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/ptp/ptp_chardev.c | 4 ++--
drivers/ptp/ptp_qoriq.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 767c485af59b..547dbdac9d54 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -221,7 +221,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
}
pct = &sysoff->ts[0];
for (i = 0; i < sysoff->n_samples; i++) {
- getnstimeofday64(&ts);
+ ktime_get_real_ts64(&ts);
pct->sec = ts.tv_sec;
pct->nsec = ts.tv_nsec;
pct++;
@@ -230,7 +230,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
pct->nsec = ts.tv_nsec;
pct++;
}
- getnstimeofday64(&ts);
+ ktime_get_real_ts64(&ts);
pct->sec = ts.tv_sec;
pct->nsec = ts.tv_nsec;
if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff)))
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 1468a1642b49..e8652c148c52 100644
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -374,7 +374,7 @@ static int qoriq_ptp_probe(struct platform_device *dev)
pr_err("ioremap ptp registers failed\n");
goto no_ioremap;
}
- getnstimeofday64(&now);
+ ktime_get_real_ts64(&now);
ptp_qoriq_settime(&qoriq_ptp->caps, &now);

tmr_ctrl =
--
2.9.0



2018-06-18 18:28:04

by Richard Cochran

[permalink] [raw]
Subject: Re: [PATCH] ptp: replace getnstimeofday64() with ktime_get_real_ts64()

On Mon, Jun 18, 2018 at 04:20:39PM +0200, Arnd Bergmann wrote:
> getnstimeofday64() is deprecated and getting replaced throughout
> the kernel with ktime_get_*() based helpers for a more consistent
> interface.
>
> The two functions do the exact same thing, so this is just
> a cosmetic change.

Acked-by: Richard Cochran <[email protected]>

2018-06-19 02:00:57

by Yangbo Lu

[permalink] [raw]
Subject: RE: [PATCH] ptp: replace getnstimeofday64() with ktime_get_real_ts64()



> -----Original Message-----
> From: Arnd Bergmann [mailto:[email protected]]
> Sent: Monday, June 18, 2018 10:21 PM
> To: Richard Cochran <[email protected]>; Y.b. Lu
> <[email protected]>
> Cc: [email protected]; Arnd Bergmann <[email protected]>; David S. Miller
> <[email protected]>; Fabio Estevam <[email protected]>;
> [email protected]; [email protected]
> Subject: [PATCH] ptp: replace getnstimeofday64() with ktime_get_real_ts64()
>
> getnstimeofday64() is deprecated and getting replaced throughout the kernel
> with ktime_get_*() based helpers for a more consistent interface.
>
> The two functions do the exact same thing, so this is just a cosmetic change.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

[Y.b. Lu] Acked-by: Yangbo Lu <[email protected]>


2018-06-19 23:01:20

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] ptp: replace getnstimeofday64() with ktime_get_real_ts64()

From: Arnd Bergmann <[email protected]>
Date: Mon, 18 Jun 2018 16:20:39 +0200

> getnstimeofday64() is deprecated and getting replaced throughout
> the kernel with ktime_get_*() based helpers for a more consistent
> interface.
>
> The two functions do the exact same thing, so this is just
> a cosmetic change.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Applied.