ptp: igb: use helpers for converting ns to timespec.
authorRichard Cochran <richardcochran@gmail.com>
Tue, 31 Mar 2015 21:08:12 +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/igb/igb_ptp.c

index c4894fb5c1d2d3eab0c4c8e0dadd5cafaea5d0c0..e3b9b63ad01083cb987429f57c9ebef84d86f4db 100644 (file)
@@ -290,7 +290,6 @@ static int igb_ptp_gettime_82576(struct ptp_clock_info *ptp,
                                               ptp_caps);
        unsigned long flags;
        u64 ns;
-       u32 remainder;
 
        spin_lock_irqsave(&igb->tmreg_lock, flags);
 
@@ -298,8 +297,7 @@ static int igb_ptp_gettime_82576(struct ptp_clock_info *ptp,
 
        spin_unlock_irqrestore(&igb->tmreg_lock, flags);
 
-       ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
-       ts->tv_nsec = remainder;
+       *ts = ns_to_timespec64(ns);
 
        return 0;
 }
@@ -328,8 +326,7 @@ static int igb_ptp_settime_82576(struct ptp_clock_info *ptp,
        unsigned long flags;
        u64 ns;
 
-       ns = ts->tv_sec * 1000000000ULL;
-       ns += ts->tv_nsec;
+       ns = timespec64_to_ns(ts);
 
        spin_lock_irqsave(&igb->tmreg_lock, flags);