GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 12:04:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ptp: replace getnstimeofday64() with ktime_get_real_ts64()

Browse source 
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>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2018-06-18 16:20:39 +02:00 • committed by David S. Miller
parent 9b0a8da8c4
commit f696a21c22
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/ptp/ptp_chardev.c
View file

@ -221,7 +221,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
} }
pct = &sysoff->ts[0]; pct = &sysoff->ts[0];
for (i = 0; i < sysoff->n_samples; i++) { for (i = 0; i < sysoff->n_samples; i++) {
getnstimeofday64(&ts); ktime_get_real_ts64(&ts);
pct->sec = ts.tv_sec; pct->sec = ts.tv_sec;
pct->nsec = ts.tv_nsec; pct->nsec = ts.tv_nsec;
pct++; pct++;
@ -230,7 +230,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
pct->nsec = ts.tv_nsec; pct->nsec = ts.tv_nsec;
pct++; pct++;
} }
getnstimeofday64(&ts); ktime_get_real_ts64(&ts);
pct->sec = ts.tv_sec; pct->sec = ts.tv_sec;
pct->nsec = ts.tv_nsec; pct->nsec = ts.tv_nsec;
if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff))) if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff)))

2
drivers/ptp/ptp_qoriq.c
View file

@ -374,7 +374,7 @@ static int qoriq_ptp_probe(struct platform_device *dev)
pr_err("ioremap ptp registers failed\n"); pr_err("ioremap ptp registers failed\n");
goto no_ioremap; goto no_ioremap;
} }
getnstimeofday64(&now); ktime_get_real_ts64(&now);
ptp_qoriq_settime(&qoriq_ptp->caps, &now); ptp_qoriq_settime(&qoriq_ptp->caps, &now);
tmr_ctrl = tmr_ctrl =