diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2015-03-29 23:12:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 12:01:19 -0400 |
| commit | 1ca13de26740dfd21e85769f08a89321c2ec1266 (patch) | |
| tree | 9edca58a0ec4d1509d98ccf3d705ec8992ec05af | |
| parent | 41c2c18ffb4d5e46bca5b419784f67db9b0c1425 (diff) | |
| download | linux-stable-1ca13de26740dfd21e85769f08a89321c2ec1266.tar.gz linux-stable-1ca13de26740dfd21e85769f08a89321c2ec1266.tar.bz2 linux-stable-1ca13de26740dfd21e85769f08a89321c2ec1266.zip | |
ptp: ixp46x: convert to the 64 bit get/set time methods.
The device has a 64 bit clock register, where each clock tick is 16
nanoseconds, and so with this patch the driver is ready for the year
2038.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index 604d340f2095..934c139916c6 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c @@ -175,7 +175,7 @@ static int ptp_ixp_adjtime(struct ptp_clock_info *ptp, s64 delta) return 0; } -static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) +static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) { u64 ns; u32 remainder; @@ -195,7 +195,7 @@ static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) } static int ptp_ixp_settime(struct ptp_clock_info *ptp, - const struct timespec *ts) + const struct timespec64 *ts) { u64 ns; unsigned long flags; @@ -248,8 +248,8 @@ static struct ptp_clock_info ptp_ixp_caps = { .pps = 0, .adjfreq = ptp_ixp_adjfreq, .adjtime = ptp_ixp_adjtime, - .gettime = ptp_ixp_gettime, - .settime = ptp_ixp_settime, + .gettime64 = ptp_ixp_gettime, + .settime64 = ptp_ixp_settime, .enable = ptp_ixp_enable, }; |