| Message ID | 20180618142109.3445025-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | f696a21c229ac3e85bc239efc52f4530b43002c5 |
| Headers | show |
| Series | ptp: replace getnstimeofday64() with ktime_get_real_ts64() | expand |
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 <richardcochran@gmail.com>
> -----Original Message----- > From: Arnd Bergmann [mailto:arnd@arndb.de] > Sent: Monday, June 18, 2018 10:21 PM > To: Richard Cochran <richardcochran@gmail.com>; Y.b. Lu > <yangbo.lu@nxp.com> > Cc: y2038@lists.linaro.org; Arnd Bergmann <arnd@arndb.de>; David S. Miller > <davem@davemloft.net>; Fabio Estevam <fabio.estevam@nxp.com>; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org > 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 <arnd@arndb.de> [Y.b. Lu] Acked-by: Yangbo Lu <yangbo.lu@nxp.com>
From: Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de> Applied.
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 =
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 <arnd@arndb.de> --- drivers/ptp/ptp_chardev.c | 4 ++-- drivers/ptp/ptp_qoriq.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0