Commit 70bc42f9 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] kernel/time/ntp.c: possible cleanups 



This patch contains the following possible cleanups:
- make the following needlessly global function static:
  - ntp_update_frequency()
- make the following needlessly global variables static:
  - time_state
  - time_offset
  - time_constant
  - time_reftime
- remove the following read-only global variable:
  - time_precision

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0883d899

include/linux/timex.h

+0 −6
Original line number Diff line number Diff line
@@ -198,21 +198,15 @@ extern int tickadj; /* amount of adjustment per tick */ 
/*

 * phase-lock loop variables

 */

extern int time_state;		/* clock status */

extern int time_status;		/* clock synchronization status bits */

extern long time_offset;	/* time adjustment (us) */

extern long time_constant;	/* pll time constant */

extern long time_precision;	/* clock precision (us) */

extern long time_maxerror;	/* maximum error */

extern long time_esterror;	/* estimated error */



extern long time_freq;		/* frequency offset (scaled ppm) */

extern long time_reftime;	/* time at last adjustment (s) */



extern long time_adjust;	/* The amount of adjtime left */



extern void ntp_clear(void);

extern void ntp_update_frequency(void);



/**

 * ntp_synced - Returns 1 if the NTP status is not UNSYNC

kernel/time/ntp.c

+20 −20
Original line number Diff line number Diff line
@@ -30,17 +30,31 @@ static u64 tick_length, tick_length_base; 
 * phase-lock loop variables

 */

/* TIME_ERROR prevents overwriting the CMOS clock */

int time_state = TIME_OK;		/* clock synchronization status	*/

static int time_state = TIME_OK;	/* clock synchronization status	*/

int time_status = STA_UNSYNC;		/* clock status bits		*/

long time_offset;			/* time adjustment (ns)		*/

long time_constant = 2;			/* pll time constant		*/

long time_precision = 1;		/* clock precision (us)		*/

static long time_offset;		/* time adjustment (ns)		*/

static long time_constant = 2;		/* pll time constant		*/

long time_maxerror = NTP_PHASE_LIMIT;	/* maximum error (us)		*/

long time_esterror = NTP_PHASE_LIMIT;	/* estimated error (us)		*/

long time_freq;				/* frequency offset (scaled ppm)*/

long time_reftime;			/* time at last adjustment (s)	*/

static long time_reftime;		/* time at last adjustment (s)	*/

long time_adjust;



#define CLOCK_TICK_OVERFLOW	(LATCH * HZ - CLOCK_TICK_RATE)

#define CLOCK_TICK_ADJUST	(((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / \

					(s64)CLOCK_TICK_RATE)



static void ntp_update_frequency(void)

{

	tick_length_base = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) << TICK_LENGTH_SHIFT;

	tick_length_base += (s64)CLOCK_TICK_ADJUST << TICK_LENGTH_SHIFT;

	tick_length_base += (s64)time_freq << (TICK_LENGTH_SHIFT - SHIFT_NSEC);



	do_div(tick_length_base, HZ);



	tick_nsec = tick_length_base >> TICK_LENGTH_SHIFT;

}



/**

 * ntp_clear - Clears the NTP state variables

 *
@@ -59,20 +73,6 @@ void ntp_clear(void) 
	time_offset = 0;

}



#define CLOCK_TICK_OVERFLOW	(LATCH * HZ - CLOCK_TICK_RATE)

#define CLOCK_TICK_ADJUST	(((s64)CLOCK_TICK_OVERFLOW * NSEC_PER_SEC) / (s64)CLOCK_TICK_RATE)



void ntp_update_frequency(void)

{

	tick_length_base = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ) << TICK_LENGTH_SHIFT;

	tick_length_base += (s64)CLOCK_TICK_ADJUST << TICK_LENGTH_SHIFT;

	tick_length_base += (s64)time_freq << (TICK_LENGTH_SHIFT - SHIFT_NSEC);



	do_div(tick_length_base, HZ);



	tick_nsec = tick_length_base >> TICK_LENGTH_SHIFT;

}



/*

 * this routine handles the overflow of the microsecond field

 *
@@ -330,7 +330,7 @@ leave: if ((time_status & (STA_UNSYNC|STA_CLOCKERR)) != 0) 
	txc->esterror	   = time_esterror;

	txc->status	   = time_status;

	txc->constant	   = time_constant;

	txc->precision	   = time_precision;

	txc->precision	   = 1;

	txc->tolerance	   = MAXFREQ;

	txc->tick	   = tick_usec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE