parisc: Convert parisc to use read/update_persistent_clock
in [Kernel]
|
Prev: [PATCH] scripts/checkpatch.pl: Change long line warning to 105 chars
Next: parisc: Convert parisc to use read/update_persistent_clock
From: Helge Deller on 6 Mar 2010 17:50 On 03/04/2010 04:57 AM, John Stultz wrote: > This patch converts the parisc architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. > > I have not built or tested this patch, so help from arch maintainers would be appreciated. Works nicely. Thanks, John. Acked-by: Helge Deller <deller(a)gmx.de> > > Cc: Kyle McMartin<kyle(a)mcmartin.ca> > Cc: Helge Deller<deller(a)gmx.de> > Cc: Thomas Gleixner<tglx(a)linutronix.de> > Cc: Andrew Morton<akpm(a)linux-foundation.org> > > Signed-off-by: John Stultz<johnstul(a)us.ibm.com> > --- > arch/parisc/kernel/time.c | 29 +++++++++++++---------------- > 1 files changed, 13 insertions(+), 16 deletions(-) > > diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c > index a79c6f9..05511cc 100644 > --- a/arch/parisc/kernel/time.c > +++ b/arch/parisc/kernel/time.c > @@ -250,9 +250,21 @@ static int __init rtc_init(void) > } > module_init(rtc_init); > > -void __init time_init(void) > +void read_persistent_clock(struct timespec *ts) > { > static struct pdc_tod tod_data; > + if (pdc_tod_read(&tod_data) == 0) { > + ts->tv_sec = tod_data.tod_sec; > + ts->tv_nsec = tod_data.tod_usec * 1000; > + } else { > + printk(KERN_ERR "Error reading tod clock\n"); > + ts->tv_sec = 0; > + ts->tv_nsec = 0; > + } > +} > + > +void __init time_init(void) > +{ > unsigned long current_cr16_khz; > > clocktick = (100 * PAGE0->mem_10msec) / HZ; > @@ -264,19 +276,4 @@ void __init time_init(void) > clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz, > clocksource_cr16.shift); > clocksource_register(&clocksource_cr16); > - > - if (pdc_tod_read(&tod_data) == 0) { > - unsigned long flags; > - > - write_seqlock_irqsave(&xtime_lock, flags); > - xtime.tv_sec = tod_data.tod_sec; > - xtime.tv_nsec = tod_data.tod_usec * 1000; > - set_normalized_timespec(&wall_to_monotonic, > - -xtime.tv_sec, -xtime.tv_nsec); > - write_sequnlock_irqrestore(&xtime_lock, flags); > - } else { > - printk(KERN_ERR "Error reading tod clock\n"); > - xtime.tv_sec = 0; > - xtime.tv_nsec = 0; > - } > } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |