Merge branch 'timecounter-next'

[cascardo/linux.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_main.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 72eef9f..0758c8b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -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;
 }
@@ -14614,7 +14610,7 @@ static void bnx2x_init_cyclecounter(struct bnx2x *bp)
 {
        memset(&bp->cyclecounter, 0, sizeof(bp->cyclecounter));
        bp->cyclecounter.read = bnx2x_cyclecounter_read;
-       bp->cyclecounter.mask = CLOCKSOURCE_MASK(64);
+       bp->cyclecounter.mask = CYCLECOUNTER_MASK(64);
        bp->cyclecounter.shift = 1;
        bp->cyclecounter.mult = 1;
 }