aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2015-03-29 17:12:12 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-31 12:01:19 -0400
commita043a72909b9ed9b3505f3be42d5329cea50c273 (patch)
treeba534670194a6bc0af4e71b42c36c33d9620f373
parent1ca13de26740dfd21e85769f08a89321c2ec1266 (diff)
ptp: pch: convert to the 64 bit get/set time methods.
The device has a 64 bit clock register, where each clock tick is 32 nanoseconds, and so with this patch the driver is ready for the year 2038. Compile tested only. Signed-off-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ptp/ptp_pch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 255487272859..3aa22ae4d94c 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -449,7 +449,7 @@ static int ptp_pch_adjtime(struct ptp_clock_info *ptp, s64 delta)
449 return 0; 449 return 0;
450} 450}
451 451
452static int ptp_pch_gettime(struct ptp_clock_info *ptp, struct timespec *ts) 452static int ptp_pch_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
453{ 453{
454 u64 ns; 454 u64 ns;
455 u32 remainder; 455 u32 remainder;
@@ -467,7 +467,7 @@ static int ptp_pch_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
467} 467}
468 468
469static int ptp_pch_settime(struct ptp_clock_info *ptp, 469static int ptp_pch_settime(struct ptp_clock_info *ptp,
470 const struct timespec *ts) 470 const struct timespec64 *ts)
471{ 471{
472 u64 ns; 472 u64 ns;
473 unsigned long flags; 473 unsigned long flags;
@@ -518,8 +518,8 @@ static struct ptp_clock_info ptp_pch_caps = {
518 .pps = 0, 518 .pps = 0,
519 .adjfreq = ptp_pch_adjfreq, 519 .adjfreq = ptp_pch_adjfreq,
520 .adjtime = ptp_pch_adjtime, 520 .adjtime = ptp_pch_adjtime,
521 .gettime = ptp_pch_gettime, 521 .gettime64 = ptp_pch_gettime,
522 .settime = ptp_pch_settime, 522 .settime64 = ptp_pch_settime,
523 .enable = ptp_pch_enable, 523 .enable = ptp_pch_enable,
524}; 524};
525 525