net: fec: convert to timecounter adjtime.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 21 Dec 2014 18:47:00 +0000 (19:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Dec 2014 23:29:26 +0000 (18:29 -0500)
This patch changes the driver to use the new and improved method
for adjusting the offset of a timecounter.

Compile tested only.

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

index 992c8c3db5536d431284d1569f18ea579594ecaa..1f9cf2345266b2f24a247768518773548d774f95 100644 (file)
@@ -374,23 +374,9 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
        struct fec_enet_private *fep =
            container_of(ptp, struct fec_enet_private, ptp_caps);
        unsigned long flags;
-       u64 now;
-       u32 counter;
 
        spin_lock_irqsave(&fep->tmreg_lock, flags);
-
-       now = timecounter_read(&fep->tc);
-       now += delta;
-
-       /* Get the timer value based on adjusted timestamp.
-        * Update the counter with the masked value.
-        */
-       counter = now & fep->cc.mask;
-       writel(counter, fep->hwp + FEC_ATIME);
-
-       /* reset the timecounter */
-       timecounter_init(&fep->tc, &fep->cc, now);
-
+       timecounter_adjtime(&fep->tc, delta);
        spin_unlock_irqrestore(&fep->tmreg_lock, flags);
 
        return 0;