net: mlx4: convert to timecounter adjtime.
authorRichard Cochran <richardcochran@gmail.com>
Sun, 21 Dec 2014 18:47:04 +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.

Compile tested only.

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

index 999014413b1aa8543c0e261f0cf38943ac0ca8e1..df35d0e1b899010f01347df1a46dc1cc2275823d 100644 (file)
@@ -147,12 +147,9 @@ static int mlx4_en_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
        struct mlx4_en_dev *mdev = container_of(ptp, struct mlx4_en_dev,
                                                ptp_clock_info);
        unsigned long flags;
-       s64 now;
 
        write_lock_irqsave(&mdev->clock_lock, flags);
-       now = timecounter_read(&mdev->clock);
-       now += delta;
-       timecounter_init(&mdev->clock, &mdev->cycles, now);
+       timecounter_adjtime(&mdev->clock, delta);
        write_unlock_irqrestore(&mdev->clock_lock, flags);
 
        return 0;