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

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

index 4a4388b..fbe42cb 100644 (file)
@@ -157,14 +157,11 @@ static int cpts_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
 
 static int cpts_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 {
-       s64 now;
        unsigned long flags;
        struct cpts *cpts = container_of(ptp, struct cpts, info);
 
        spin_lock_irqsave(&cpts->lock, flags);
-       now = timecounter_read(&cpts->tc);
-       now += delta;
-       timecounter_init(&cpts->tc, &cpts->cc, now);
+       timecounter_adjtime(&cpts->tc, delta);
        spin_unlock_irqrestore(&cpts->lock, flags);
 
        return 0;