summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2014-12-21 19:47:05 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-31 00:29:27 +0100
commitf25a30be359d0535fb1c7c1619cabb0ad17cfbf1 (patch)
tree655d71b8bbc9543173f071f4771748f6ebcd7b48
parentnet: mlx4: convert to timecounter adjtime. (diff)
downloadlinux-f25a30be359d0535fb1c7c1619cabb0ad17cfbf1.tar.xz
linux-f25a30be359d0535fb1c7c1619cabb0ad17cfbf1.zip
net: cpts: convert to timecounter adjtime.
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>
-rw-r--r--drivers/net/ethernet/ti/cpts.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c
index 4a4388b813ac..fbe42cb107ec 100644
--- a/drivers/net/ethernet/ti/cpts.c
+++ b/drivers/net/ethernet/ti/cpts.c
@@ -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;