kernel/time.c: remove unused pps_* variables
PATCH 1/1 kernel/time.c: remove unused pps_* variables
AFAIR there is a patch floating around that might use these variables, but this patch is still unmerged and my patch can easily be undone.
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 18 Feb 2006
include/linux/timex.h | 8 -------- kernel/time.c | 23 ++++++----------------- 2 files changed, 6 insertions(+), 25 deletions(-)
include/linux/timex.h renamed from include/linux/timex.h.old +0 -8
@@ -247,19 +247,11 @@extern long time_next_adjust;/* Value for time_adjust at next tick */ /* interface variables pps->timer interrupt */ -extern long pps_offset;/* pps time offset (us) */ extern long pps_jitter;/* time dispersion (jitter) (us) */ extern long pps_freq;/* frequency offset (scaled ppm) */ extern long pps_stabil;/* frequency dispersion (scaled ppm) */ extern long pps_valid;/* pps signal watchdog counter */ -/* interface variables pps->adjtimex */ -extern int pps_shift;/* interval duration (s) (shift) */ -extern long pps_jitcnt;/* jitter limit exceeded */ -extern long pps_calcnt;/* calibration intervals */ -extern long pps_errcnt;/* calibration errors */ -extern long pps_stbcnt;/* stability limit exceeded */ -extern seqlock_t ntp_lock;/**
kernel/time.c renamed from kernel/time.c.old +6 -17
@@ -216,7 +216,6 @@return do_sys_settimeofday (tv ? &new_ts :NULL , tz ? &new_tz :NULL ); } -long pps_offset;/* pps time offset (us) */ long pps_jitter =MAXTIME ;/* time dispersion (jitter) (us) */ long pps_freq;/* frequency offset (scaled ppm) */
@@ -224,16 +223,6 @@long pps_valid =PPS_VALID ;/* pps signal watchdog counter */ -int pps_shift =PPS_SHIFT ;/* interval duration (s) (shift) */ - -long pps_jitcnt;/* jitter limit exceeded */ -long pps_calcnt;/* calibration intervals */ -long pps_errcnt;/* calibration errors */ -long pps_stbcnt;/* stability limit exceeded */ - -/* hook for a loadable hardpps kernel module */ -void (*hardpps_ptr)(struct timeval *); -/* we call this to notify the arch when the clock is being * controlled. If no such arch routine, do nothing. */
@@ -331,7 +320,7 @@else if ( time_status & (STA_PLL |STA_PPSTIME ) ) { ltemp = (time_status & (STA_PPSTIME |STA_PPSSIGNAL )) == (STA_PPSTIME |STA_PPSSIGNAL ) ? - pps_offset : txc->offset; +0 : txc->offset;/* * Scale the phase adjustment and
@@ -406,12 +395,12 @@ txc->tick = tick_usec; txc->ppsfreq = pps_freq; txc->jitter = pps_jitter >>PPS_AVG ; - txc->shift = pps_shift; + txc->shift =0 ; txc->stabil = pps_stabil; - txc->jitcnt = pps_jitcnt; - txc->calcnt = pps_calcnt; - txc->errcnt = pps_errcnt; - txc->stbcnt = pps_stbcnt; + txc->jitcnt =0 ; + txc->calcnt =0 ; + txc->errcnt =0 ; + txc->stbcnt =0 ;write_sequnlock (&ntp_lock);write_sequnlock_irq (&xtime_lock);do_gettimeofday (&txc->time);