]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ptp: ixp46x: convert to the 64 bit get/set time methods.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 29 Mar 2015 21:12:11 +0000 (23:12 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Mar 2015 16:01:19 +0000 (12:01 -0400)
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>
drivers/ptp/ptp_ixp46x.c

index 604d340f20956bc1d0df55cc692d76d0f313df02..934c139916c609e3647acd5c6229a781ca348d56 100644 (file)
@@ -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,
 };