projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce51ff0
)
net: cpts: convert to timecounter adjtime.
author
Richard Cochran
<
[email protected]
>
Sun, 21 Dec 2014 18:47:05 +0000
(19:47 +0100)
committer
David S. Miller
<
[email protected]
>
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.
Signed-off-by: Richard Cochran <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/ti/cpts.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/ti/cpts.c
b/drivers/net/ethernet/ti/cpts.c
index 4a4388b813ac6b2392917da20f873ceb34297e39..fbe42cb107ecadde04bc5d6d07a709020075e7bb 100644
(file)
--- 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;