aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-10-01 02:28:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:27 -0400
commit0883d899ef862c1b0f8b2c2d38098470c193a3dd (patch)
tree414fcb7849c285bed87928b4d5be21304cd6724e
parentf19923937321244e7dc334767eb4b67e0e3d5c74 (diff)
[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>
-rw-r--r--include/asm-frv/timex.h5
-rw-r--r--include/asm-m32r/timex.h3
-rw-r--r--include/asm-sh64/timex.h3
-rw-r--r--include/asm-xtensa/timex.h3
-rw-r--r--include/linux/timex.h13
5 files changed, 3 insertions, 24 deletions
diff --git a/include/asm-frv/timex.h b/include/asm-frv/timex.h
index 2aa562fa067b..a89bddefdacf 100644
--- a/include/asm-frv/timex.h
+++ b/include/asm-frv/timex.h
@@ -6,11 +6,6 @@
6#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ 6#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
7#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 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
14typedef unsigned long cycles_t; 9typedef unsigned long cycles_t;
15 10
16static inline cycles_t get_cycles(void) 11static inline cycles_t get_cycles(void)
diff --git a/include/asm-m32r/timex.h b/include/asm-m32r/timex.h
index e89bfd17db51..019441c1d7a0 100644
--- a/include/asm-m32r/timex.h
+++ b/include/asm-m32r/timex.h
@@ -12,9 +12,6 @@
12 12
13#define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) 13#define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)
14#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 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#ifdef __KERNEL__ 16#ifdef __KERNEL__
20/* 17/*
diff --git a/include/asm-sh64/timex.h b/include/asm-sh64/timex.h
index af0b79269661..163e2b62fe27 100644
--- a/include/asm-sh64/timex.h
+++ b/include/asm-sh64/timex.h
@@ -17,9 +17,6 @@
17 17
18#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ 18#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
19#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ 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
24typedef unsigned long cycles_t; 21typedef unsigned long cycles_t;
25 22
diff --git a/include/asm-xtensa/timex.h b/include/asm-xtensa/timex.h
index d14a3755a12b..c7b705e66655 100644
--- a/include/asm-xtensa/timex.h
+++ b/include/asm-xtensa/timex.h
@@ -31,9 +31,6 @@
31 31
32#define CLOCK_TICK_RATE 1193180 /* (everyone is using this value) */ 32#define CLOCK_TICK_RATE 1193180 /* (everyone is using this value) */
33#define CLOCK_TICK_FACTOR 20 /* Factor of both 10^6 and CLOCK_TICK_RATE */ 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#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT 35#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
39extern unsigned long ccount_per_jiffy; 36extern unsigned long ccount_per_jiffy;
diff --git a/include/linux/timex.h b/include/linux/timex.h
index ac808f13fa0e..261381b5da82 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -74,24 +74,17 @@
74#define MAXTC 10 /* maximum time constant (shift) */ 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 77 * The SHIFT_UPDATE define establishes the decimal point of the
78 * variable which serves as an extension to the low-order bits of the 78 * time_offset variable which represents the current offset with
79 * system clock variable. The SHIFT_UPDATE define establishes the decimal 79 * respect to standard time.
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.
83 * 80 *
84 * SHIFT_USEC defines the scaling (shift) of the time_freq and 81 * SHIFT_USEC defines the scaling (shift) of the time_freq and
85 * time_tolerance variables, which represent the current frequency 82 * time_tolerance variables, which represent the current frequency
86 * offset and maximum frequency tolerance. 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#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */ 85#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */
92#define SHIFT_USEC 16 /* frequency offset scale (shift) */ 86#define SHIFT_USEC 16 /* frequency offset scale (shift) */
93#define SHIFT_NSEC 12 /* kernel frequency offset scale */ 87#define SHIFT_NSEC 12 /* kernel frequency offset scale */
94#define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */
95 88
96#define MAXPHASE 512000L /* max phase error (us) */ 89#define MAXPHASE 512000L /* max phase error (us) */
97#define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */ 90#define MAXFREQ (512L << SHIFT_USEC) /* max frequency error (ppm) */