diff options
author | Richard Cochran <richardcochran@gmail.com> | 2015-03-29 17:12:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-31 12:01:19 -0400 |
commit | 1ca13de26740dfd21e85769f08a89321c2ec1266 (patch) | |
tree | 9edca58a0ec4d1509d98ccf3d705ec8992ec05af | |
parent | 41c2c18ffb4d5e46bca5b419784f67db9b0c1425 (diff) |
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) | |||
175 | return 0; | 175 | return 0; |
176 | } | 176 | } |
177 | 177 | ||
178 | static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) | 178 | static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) |
179 | { | 179 | { |
180 | u64 ns; | 180 | u64 ns; |
181 | u32 remainder; | 181 | u32 remainder; |
@@ -195,7 +195,7 @@ static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec *ts) | |||
195 | } | 195 | } |
196 | 196 | ||
197 | static int ptp_ixp_settime(struct ptp_clock_info *ptp, | 197 | static int ptp_ixp_settime(struct ptp_clock_info *ptp, |
198 | const struct timespec *ts) | 198 | const struct timespec64 *ts) |
199 | { | 199 | { |
200 | u64 ns; | 200 | u64 ns; |
201 | unsigned long flags; | 201 | unsigned long flags; |
@@ -248,8 +248,8 @@ static struct ptp_clock_info ptp_ixp_caps = { | |||
248 | .pps = 0, | 248 | .pps = 0, |
249 | .adjfreq = ptp_ixp_adjfreq, | 249 | .adjfreq = ptp_ixp_adjfreq, |
250 | .adjtime = ptp_ixp_adjtime, | 250 | .adjtime = ptp_ixp_adjtime, |
251 | .gettime = ptp_ixp_gettime, | 251 | .gettime64 = ptp_ixp_gettime, |
252 | .settime = ptp_ixp_settime, | 252 | .settime64 = ptp_ixp_settime, |
253 | .enable = ptp_ixp_enable, | 253 | .enable = ptp_ixp_enable, |
254 | }; | 254 | }; |
255 | 255 | ||