11 files changed, 20 insertions, 47 deletions

diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
index 0c37aefaaea0..096531a73124 100644
--- a/drivers/net/ethernet/adi/bfin_mac.c
+++ b/drivers/net/ethernet/adi/bfin_mac.c
@@ -986,7 +986,6 @@ static int bfin_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 static int bfin_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 {
         u64 ns;
-        u32 remainder;
         unsigned long flags;
         struct bfin_mac_local *lp =
                 container_of(ptp, struct bfin_mac_local, caps);
@@ -997,8 +996,8 @@ static int bfin_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 
         spin_unlock_irqrestore(&lp->phc_lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
+
         return 0;
 }
 
@@ -1010,8 +1009,7 @@ static int bfin_ptp_settime(struct ptp_clock_info *ptp,
         struct bfin_mac_local *lp =
                 container_of(ptp, struct bfin_mac_local, caps);
 
-        ns = ts->tv_sec * 1000000000ULL;
-        ns += ts->tv_nsec;
+        ns = timespec64_to_ns(ts);
 
         spin_lock_irqsave(&lp->phc_lock, flags);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f0466a028145..177cb0e722e7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13290,14 +13290,12 @@ static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 {
         struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
         u64 ns;
-        u32 remainder;
 
         ns = timecounter_read(&bp->timecounter);
 
         DP(BNX2X_MSG_PTP, "PTP gettime called, ns = %llu\n", ns);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
@@ -13308,8 +13306,7 @@ static int bnx2x_ptp_settime(struct ptp_clock_info *ptp,
         struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
         u64 ns;
 
-        ns = ts->tv_sec * 1000000000ULL;
-        ns += ts->tv_nsec;
+        ns = timespec64_to_ns(ts);
 
         DP(BNX2X_MSG_PTP, "PTP settime called, ns = %llu\n", ns);
 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index d02d19bd34e0..1270b189a9a2 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6220,7 +6220,6 @@ static int tg3_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 static int tg3_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 {
         u64 ns;
-        u32 remainder;
         struct tg3 *tp = container_of(ptp, struct tg3, ptp_info);
 
         tg3_full_lock(tp, 0);
@@ -6228,8 +6227,7 @@ static int tg3_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
         ns += tp->ptp_adjust;
         tg3_full_unlock(tp);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index b833993d2e19..a583d89b13c4 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -395,15 +395,13 @@ static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
         struct fec_enet_private *adapter =
             container_of(ptp, struct fec_enet_private, 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;
 }
@@ -433,8 +431,7 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
                 return -EINVAL;
         }
 
-        ns = ts->tv_sec * 1000000000ULL;
-        ns += ts->tv_nsec;
+        ns = timespec64_to_ns(ts);
         /* Get the timer value based on timestamp.
          * Update the counter with the masked value.
          */
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 04265a7275e5..8e3cd77aa347 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -326,7 +326,6 @@ static int ptp_gianfar_gettime(struct ptp_clock_info *ptp,
                                struct timespec64 *ts)
 {
         u64 ns;
-        u32 remainder;
         unsigned long flags;
         struct etsects *etsects = container_of(ptp, struct etsects, caps);
 
@@ -336,8 +335,8 @@ static int ptp_gianfar_gettime(struct ptp_clock_info *ptp,
 
         spin_unlock_irqrestore(&etsects->lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
+
         return 0;
 }
 
@@ -348,8 +347,7 @@ static int ptp_gianfar_settime(struct ptp_clock_info *ptp,
         unsigned long flags;
         struct etsects *etsects = container_of(ptp, struct etsects, caps);
 
-        ns = ts->tv_sec * 1000000000ULL;
-        ns += ts->tv_nsec;
+        ns = timespec64_to_ns(ts);
 
         spin_lock_irqsave(&etsects->lock, flags);
 
diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c
index 6fedc2c327dd..8d7b21dc7e19 100644
--- a/drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/drivers/net/ethernet/intel/e1000e/ptp.c
@@ -111,15 +111,13 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
         struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,
                                                      ptp_clock_info);
         unsigned long flags;
-        u32 remainder;
         u64 ns;
 
         spin_lock_irqsave(&adapter->systim_lock, flags);
         ns = timecounter_read(&adapter->tc);
         spin_unlock_irqrestore(&adapter->systim_lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index c4894fb5c1d2..e3b9b63ad010 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -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);
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 75b9e938728d..e5ba04025e2b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -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);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index 666e7bdeb4f1..8a083d73efdb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -170,15 +170,13 @@ static int mlx4_en_phc_gettime(struct ptp_clock_info *ptp,
         struct mlx4_en_dev *mdev = container_of(ptp, struct mlx4_en_dev,
                                                 ptp_clock_info);
         unsigned long flags;
-        u32 remainder;
         u64 ns;
 
         write_lock_irqsave(&mdev->clock_lock, flags);
         ns = timecounter_read(&mdev->clock);
         write_unlock_irqrestore(&mdev->clock_lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 172f3188361e..170a18b61281 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -111,7 +111,6 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)
             container_of(ptp, struct stmmac_priv, ptp_clock_ops);
         unsigned long flags;
         u64 ns;
-        u32 reminder;
 
         spin_lock_irqsave(&priv->ptp_lock, flags);
 
@@ -119,8 +118,7 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)
 
         spin_unlock_irqrestore(&priv->ptp_lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000ULL, &reminder);
-        ts->tv_nsec = reminder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 074b6369da66..85a55b4ff8c0 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -170,7 +170,6 @@ static int cpts_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 static int cpts_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
 {
         u64 ns;
-        u32 remainder;
         unsigned long flags;
         struct cpts *cpts = container_of(ptp, struct cpts, info);
 
@@ -178,8 +177,7 @@ static int cpts_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
         ns = timecounter_read(&cpts->tc);
         spin_unlock_irqrestore(&cpts->lock, flags);
 
-        ts->tv_sec = div_u64_rem(ns, 1000000000, &remainder);
-        ts->tv_nsec = remainder;
+        *ts = ns_to_timespec64(ns);
 
         return 0;
 }
@@ -191,8 +189,7 @@ static int cpts_ptp_settime(struct ptp_clock_info *ptp,
         unsigned long flags;
         struct cpts *cpts = container_of(ptp, struct cpts, info);
 
-        ns = ts->tv_sec * 1000000000ULL;
-        ns += ts->tv_nsec;
+        ns = timespec64_to_ns(ts);
 
         spin_lock_irqsave(&cpts->lock, flags);
         timecounter_init(&cpts->tc, &cpts->cc, ns);