net: xgbe: convert to timecounter adjtime.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 21 Dec 2014 18:46:58 +0000 (19:46 +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/amd/xgbe/xgbe-ptp.c

index a1bf9d1cdae1e9d5dc666cf7b37f6320d1b2adff..f5acf4cc69bdabbda7b2a489b50ef0b740fc0bf1 100644 (file)
@@ -171,15 +171,9 @@ static int xgbe_adjtime(struct ptp_clock_info *info, s64 delta)
                                                   struct xgbe_prv_data,
                                                   ptp_clock_info);
        unsigned long flags;
-       u64 nsec;
 
        spin_lock_irqsave(&pdata->tstamp_lock, flags);
-
-       nsec = timecounter_read(&pdata->tstamp_tc);
-
-       nsec += delta;
-       timecounter_init(&pdata->tstamp_tc, &pdata->tstamp_cc, nsec);
-
+       timecounter_adjtime(&pdata->tstamp_tc, delta);
        spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
 
        return 0;