Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ntp: cleanup defines and comments

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

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Roman Zippel and committed by
Linus Torvalds
0883d899 f1992393

+3 -24
-5
include/asm-frv/timex.h
··· 6 6 #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ 7 7 #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 8 8 9 - #define FINETUNE \ 10 - ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \ 11 - (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \ 12 - << (SHIFT_SCALE-SHIFT_HZ)) / HZ) 13 - 14 9 typedef unsigned long cycles_t; 15 10 16 11 static inline cycles_t get_cycles(void)
-3
include/asm-m32r/timex.h
··· 12 12 13 13 #define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) 14 14 #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 15 - #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \ 16 - (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \ 17 - << (SHIFT_SCALE-SHIFT_HZ)) / HZ) 18 15 19 16 #ifdef __KERNEL__ 20 17 /*
-3
include/asm-sh64/timex.h
··· 17 17 18 18 #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ 19 19 #define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 20 - #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \ 21 - (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \ 22 - << (SHIFT_SCALE-SHIFT_HZ)) / HZ) 23 20 24 21 typedef unsigned long cycles_t; 25 22
-3
include/asm-xtensa/timex.h
··· 31 31 32 32 #define CLOCK_TICK_RATE 1193180 /* (everyone is using this value) */ 33 33 #define CLOCK_TICK_FACTOR 20 /* Factor of both 10^6 and CLOCK_TICK_RATE */ 34 - #define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \ 35 - (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \ 36 - << (SHIFT_SCALE-SHIFT_HZ)) / HZ) 37 34 38 35 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT 39 36 extern unsigned long ccount_per_jiffy;
+3 -10
include/linux/timex.h
··· 74 74 #define MAXTC 10 /* maximum time constant (shift) */ 75 75 76 76 /* 77 - * The SHIFT_SCALE define establishes the decimal point of the time_phase 78 - * variable which serves as an extension to the low-order bits of the 79 - * system clock variable. The SHIFT_UPDATE define establishes the decimal 80 - * point of the time_offset variable which represents the current offset 81 - * with respect to standard time. The FINENSEC define represents 1 nsec in 82 - * scaled units. 77 + * The SHIFT_UPDATE define establishes the decimal point of the 78 + * time_offset variable which represents the current offset with 79 + * respect to standard time. 83 80 * 84 81 * SHIFT_USEC defines the scaling (shift) of the time_freq and 85 82 * time_tolerance variables, which represent the current frequency 86 83 * offset and maximum frequency tolerance. 87 - * 88 - * FINENSEC is 1 ns in SHIFT_UPDATE units of the time_phase variable. 89 84 */ 90 - #define SHIFT_SCALE 22 /* phase scale (shift) */ 91 85 #define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */ 92 86 #define SHIFT_USEC 16 /* frequency offset scale (shift) */ 93 87 #define SHIFT_NSEC 12 /* kernel frequency offset scale */ 94 - #define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */ 95 88 96 89 #define MAXPHASE 512000L /* max phase error (us) */ 97 90 #define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */