diff options
author | Kefeng Wang <wangkefeng.wang@huawei.com> | 2016-01-28 10:27:19 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-29 12:38:59 -0800 |
commit | b83ef507d9e2bc25cea40b1fb13ebd1ca7c4969a (patch) | |
tree | 1ba15767135207cb9f9e1f682e84b1b58619dec6 /drivers/ptp | |
parent | 21603fc45bdef3696f45d80a1c9d730e06b925c5 (diff) | |
download | linux-stable-b83ef507d9e2bc25cea40b1fb13ebd1ca7c4969a.tar.gz linux-stable-b83ef507d9e2bc25cea40b1fb13ebd1ca7c4969a.tar.bz2 linux-stable-b83ef507d9e2bc25cea40b1fb13ebd1ca7c4969a.zip |
ptp: ixp46x: use helpers for converting ns to timespec
Convert the driver to use ns_to_timespec64() and timespec64_to_ns()
instead of open coding the same logic.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ptp')
-rw-r--r-- | drivers/ptp/ptp_ixp46x.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c index 934c139916c6..ee4f183ef9ee 100644 --- a/drivers/ptp/ptp_ixp46x.c +++ b/drivers/ptp/ptp_ixp46x.c @@ -178,7 +178,6 @@ static int ptp_ixp_adjtime(struct ptp_clock_info *ptp, s64 delta) static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) { u64 ns; - u32 remainder; unsigned long flags; struct ixp_clock *ixp_clock = container_of(ptp, struct ixp_clock, caps); struct ixp46x_ts_regs *regs = ixp_clock->regs; @@ -189,8 +188,7 @@ static int ptp_ixp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) spin_unlock_irqrestore(®ister_lock, flags); - ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder); - ts->tv_nsec = remainder; + *ts = ns_to_timespec64(ns); return 0; } @@ -202,8 +200,7 @@ static int ptp_ixp_settime(struct ptp_clock_info *ptp, struct ixp_clock *ixp_clock = container_of(ptp, struct ixp_clock, caps); struct ixp46x_ts_regs *regs = ixp_clock->regs; - ns = ts->tv_sec * 1000000000ULL; - ns += ts->tv_nsec; + ns = timespec64_to_ns(ts); spin_lock_irqsave(®ister_lock, flags); |