Re: [PATCHv7 16/16] pps: add parallel port PPS signal generator

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andrew Morton
Date: Thursday, December 23, 2010 - 5:35 pm

On Mon, 20 Dec 2010 14:54:56 +0300
Alexander Gordeev <lasaine@lvk.cs.msu.su> wrote:


It's bad to play around with internal fields, especially when an
accessor API was provided to access those fields.

And lo, hrtimers got changed in linux-next:

drivers/pps/generators/pps_gen_parport.c: In function 'hrtimer_event':
drivers/pps/generators/pps_gen_parport.c:92: error: 'struct hrtimer' has no member named '_expires'

The documentation in hrtimer.h is of course complete crap and
Documentation/timers/hrtimers.txt appears to be bitrot, but with a little
sleuthing and guesswork, it seems that what you want here is



--- a/drivers/pps/generators/pps_gen_parport.c~pps-add-parallel-port-pps-signal-generator-fix
+++ a/drivers/pps/generators/pps_gen_parport.c
@@ -82,7 +82,7 @@ static enum hrtimer_restart hrtimer_even
 
 	/* first of all we get the time stamp... */
 	getnstimeofday(&ts1);
-	expire_time = ktime_to_timespec(timer->_expires);
+	expire_time = ktime_to_timespec(hrtimer_get_softexpires(timer));
 	dev = container_of(timer, struct pps_generator_pp, timer);
 	lim = NSEC_PER_SEC - send_delay - dev->port_write_time;
 
_

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCHv6 00/16] pps: several fixes and improvements, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 03/16] pps: fix race in PPS_FETCH handler, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 04/16] pps: unify timestamp gathering, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 05/16] pps: access pps device by direct pointer, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 06/16] pps: convert printk/pr_* to dev_*, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 07/16] pps: move idr stuff to pps.c, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 08/16] pps: do not disable interrupts for idr ope ..., Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 09/16] pps: use BUG_ON for kernel API safety checks, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 10/16] pps: simplify conditions a bit, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 11/16] pps: timestamp is always passed to dcd_cha ..., Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 12/16] ntp: add hardpps implementation, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 13/16] pps: capture MONOTONIC_RAW timestamps as well, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 14/16] pps: add kernel consumer support, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 15/16] pps: add parallel port PPS client, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
[PATCHv6 16/16] pps: add parallel port PPS signal generator, Alexander Gordeev, (Fri Dec 17, 12:54 pm)
Re: [PATCHv6 07/16] pps: move idr stuff to pps.c, Andrew Morton, (Fri Dec 17, 5:13 pm)
Re: [PATCHv6 15/16] pps: add parallel port PPS client, Andrew Morton, (Fri Dec 17, 5:17 pm)
Re: [PATCHv6 00/16] pps: several fixes and improvements, Andrew Morton, (Fri Dec 17, 5:19 pm)
Re: [PATCHv6 15/16] pps: add parallel port PPS client, Alexander Gordeev, (Fri Dec 17, 5:50 pm)
Re: [PATCHv6 16/16] pps: add parallel port PPS signal gene ..., Alexander Gordeev, (Fri Dec 17, 5:52 pm)
Re: [PATCHv6 00/16] pps: several fixes and improvements, Alexander Gordeev, (Fri Dec 17, 6:00 pm)
Re: [PATCHv6 07/16] pps: move idr stuff to pps.c, Alexander Gordeev, (Fri Dec 17, 6:07 pm)
Re: [PATCHv6 15/16] pps: add parallel port PPS client, Andrew Morton, (Fri Dec 17, 6:13 pm)
Re: [PATCHv6 00/16] pps: several fixes and improvements, Andrew Morton, (Fri Dec 17, 6:14 pm)
Re: [PATCHv6 07/16] pps: move idr stuff to pps.c, Andrew Morton, (Fri Dec 17, 6:18 pm)
[PATCHv7 00/16] changed some patches, Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 08/16] pps: make idr lock a mutex and protect idr ..., Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 12/16] ntp: add hardpps implementation, Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 13/16] pps: capture MONOTONIC_RAW timestamps as well, Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 14/16] pps: add kernel consumer support, Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 15/16] pps: add parallel port PPS client, Alexander Gordeev, (Mon Dec 20, 4:54 am)
[PATCHv7 16/16] pps: add parallel port PPS signal generator, Alexander Gordeev, (Mon Dec 20, 4:54 am)
Re: [PATCHv7 16/16] pps: add parallel port PPS signal gene ..., Andrew Morton, (Thu Dec 23, 5:35 pm)
Re: [PATCHv7 16/16] pps: add parallel port PPS signal gene ..., Alexander Gordeev, (Thu Dec 23, 6:37 pm)