Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0883d899 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] ntp: cleanup defines and comments 



Remove a few unused defines and remove obsolete information from comments.

Signed-off-by: default avatarRoman 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 f1992393

include/asm-frv/timex.h

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ 
#define CLOCK_TICK_RATE		1193180 /* Underlying HZ */

#define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */



#define FINETUNE							\

((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) *			\

   (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR))	\

  << (SHIFT_SCALE-SHIFT_HZ)) / HZ)



typedef unsigned long cycles_t;



static inline cycles_t get_cycles(void)

include/asm-m32r/timex.h

+0 −3
Original line number Diff line number Diff line
@@ -12,9 +12,6 @@ 


#define CLOCK_TICK_RATE	(CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)

#define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */

#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \

	(1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \

		<< (SHIFT_SCALE-SHIFT_HZ)) / HZ)



#ifdef __KERNEL__

/*

include/asm-sh64/timex.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */

#define CLOCK_TICK_FACTOR	20	/* Factor of both 1000000 and CLOCK_TICK_RATE */

#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \

	(1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \

		<< (SHIFT_SCALE-SHIFT_HZ)) / HZ)



typedef unsigned long cycles_t;

include/asm-xtensa/timex.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 


#define CLOCK_TICK_RATE 	1193180	/* (everyone is using this value) */

#define CLOCK_TICK_FACTOR       20 /* Factor of both 10^6 and CLOCK_TICK_RATE */

#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \

	(1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \

		<< (SHIFT_SCALE-SHIFT_HZ)) / HZ)



#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT

extern unsigned long ccount_per_jiffy;

include/linux/timex.h

+3 −10
Original line number Diff line number Diff line
@@ -74,24 +74,17 @@ 
#define MAXTC		10	/* maximum time constant (shift) */



/*

 * The SHIFT_SCALE define establishes the decimal point of the time_phase

 * variable which serves as an extension to the low-order bits of the

 * system clock variable. The SHIFT_UPDATE define establishes the decimal

 * point of the time_offset variable which represents the current offset

 * with respect to standard time. The FINENSEC define represents 1 nsec in

 * scaled units.

 * The SHIFT_UPDATE define establishes the decimal point of the

 * time_offset variable which represents the current offset with

 * respect to standard time.

 *

 * SHIFT_USEC defines the scaling (shift) of the time_freq and

 * time_tolerance variables, which represent the current frequency

 * offset and maximum frequency tolerance.

 *

 * FINENSEC is 1 ns in SHIFT_UPDATE units of the time_phase variable.

 */

#define SHIFT_SCALE 22		/* phase scale (shift) */

#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */

#define SHIFT_USEC 16		/* frequency offset scale (shift) */

#define SHIFT_NSEC 12		/* kernel frequency offset scale */

#define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */



#define MAXPHASE 512000L        /* max phase error (us) */

#define MAXFREQ (512L << SHIFT_USEC)  /* max frequency error (ppm) */