diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2014-12-21 19:47:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-31 00:29:26 +0100 |
| commit | 59e16961c688a50d4dae9827cc3e5c69ae98e0cb (patch) | |
| tree | 81f328ca54babce61b332eacac1b6c68b097b4f8 | |
| parent | net: bnx2x: convert to timecounter adjtime. (diff) | |
| download | linux-59e16961c688a50d4dae9827cc3e5c69ae98e0cb.tar.xz linux-59e16961c688a50d4dae9827cc3e5c69ae98e0cb.zip | |
net: fec: convert to timecounter adjtime.
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>
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_ptp.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 992c8c3db553..1f9cf2345266 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -374,23 +374,9 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) struct fec_enet_private *fep = container_of(ptp, struct fec_enet_private, ptp_caps); unsigned long flags; - u64 now; - u32 counter; spin_lock_irqsave(&fep->tmreg_lock, flags); - - now = timecounter_read(&fep->tc); - now += delta; - - /* Get the timer value based on adjusted timestamp. - * Update the counter with the masked value. - */ - counter = now & fep->cc.mask; - writel(counter, fep->hwp + FEC_ATIME); - - /* reset the timecounter */ - timecounter_init(&fep->tc, &fep->cc, now); - + timecounter_adjtime(&fep->tc, delta); spin_unlock_irqrestore(&fep->tmreg_lock, flags); return 0; |