net: bnx2x: convert to timecounter adjtime.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 21 Dec 2014 18:46:59 +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/broadcom/bnx2x/bnx2x_main.c

index 72eef9fc883e8983d7544abd685fbb36da19951d..2c951326a85daa8f93e7cc2933808895cd6c6597 100644 (file)
@@ -13267,14 +13267,10 @@ static int bnx2x_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
 static int bnx2x_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 {
        struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
-       u64 now;
 
        DP(BNX2X_MSG_PTP, "PTP adjtime called, delta = %llx\n", delta);
 
-       now = timecounter_read(&bp->timecounter);
-       now += delta;
-       /* Re-init the timecounter */
-       timecounter_init(&bp->timecounter, &bp->cyclecounter, now);
+       timecounter_adjtime(&bp->timecounter, delta);
 
        return 0;
 }