ptp: ixgbe: use helpers for converting ns to timespec.
authorRichard Cochran <richardcochran@gmail.com>
Tue, 31 Mar 2015 21:08:13 +0000 (23:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Mar 2015 21:19:19 +0000 (17:19 -0400)
This patch changes the driver to use ns_to_timespec64() and
timespec64_to_ns() instead of open coding the same logic.

Compile tested only.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

index 75b9e938728d61b765b13b86c41d440f12f76c85..e5ba04025e2b9dc76d58090cd5a46a563fbf22e4 100644 (file)
@@ -284,15 +284,13 @@ static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
        struct ixgbe_adapter *adapter =
                container_of(ptp, struct ixgbe_adapter, ptp_caps);
        u64 ns;
-       u32 remainder;
        unsigned long flags;
 
        spin_lock_irqsave(&adapter->tmreg_lock, flags);
        ns = timecounter_read(&adapter->tc);
        spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
 
-       ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &remainder);
-       ts->tv_nsec = remainder;
+       *ts = ns_to_timespec64(ns);
 
        return 0;
 }
@@ -313,8 +311,7 @@ static int ixgbe_ptp_settime(struct ptp_clock_info *ptp,
        u64 ns;
        unsigned long flags;
 
-       ns = ts->tv_sec * 1000000000ULL;
-       ns += ts->tv_nsec;
+       ns = timespec64_to_ns(ts);
 
        /* reset the timecounter */
        spin_lock_irqsave(&adapter->tmreg_lock, flags);