p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ptp: deprecate gettime64() in favor of gettimex64() 

When a driver provides gettimex64(), use it in the PTP_SYS_OFFSET ioctl
and POSIX clock's gettime() instead of gettime64(). Drivers should
provide only one of the functions.

Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Miroslav Lichvar 2018-11-09 11:14:45 +01:00 committed by David S. Miller
parent 361800876f
commit 916444df30
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ptp/ptp_chardev.c
View File

@ -260,7 +260,10 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
pct->sec = ts.tv_sec; pct->sec = ts.tv_sec;
pct->nsec = ts.tv_nsec; pct->nsec = ts.tv_nsec;
pct++; pct++;
err = ptp->info->gettime64(ptp->info, &ts); if (ops->gettimex64)
err = ops->gettimex64(ops, &ts, NULL);
else
err = ops->gettime64(ops, &ts);
if (err) if (err)
goto out; goto out;
pct->sec = ts.tv_sec; pct->sec = ts.tv_sec;

5
drivers/ptp/ptp_clock.c
View File

@ -117,7 +117,10 @@ static int ptp_clock_gettime(struct posix_clock *pc, struct timespec64 *tp)
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
int err; int err;
err = ptp->info->gettime64(ptp->info, tp); if (ptp->info->gettimex64)
err = ptp->info->gettimex64(ptp->info, tp, NULL);
else
err = ptp->info->gettime64(ptp->info, tp);
return err; return err;
} }

2
include/linux/ptp_clock_kernel.h
View File

@ -82,6 +82,8 @@ struct ptp_system_timestamp {
* parameter delta: Desired change in nanoseconds. * parameter delta: Desired change in nanoseconds.
* *
* @gettime64: Reads the current time from the hardware clock. * @gettime64: Reads the current time from the hardware clock.
* This method is deprecated. New drivers should implement
* the @gettimex64 method instead.
* parameter ts: Holds the result. * parameter ts: Holds the result.
* *
* @gettimex64: Reads the current time from the hardware clock and optionally * @gettimex64: Reads the current time from the hardware clock and optionally