x86: kill 8253pit.h

Useless header file with 32 bit and 64 bit variants. Move the
single useful line to the place where it is used.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c
index 0499cbe9871a4bb410c762f89bec6756685280fe..679bb33acbf1ce30e216a7a05e4e1d9cd61e5d2b 100644 (file)
--- a/arch/x86/kernel/i8259_32.c
+++ b/arch/x86/kernel/i8259_32.c
@@ -10,7 +10,6 @@
 #include <linux/sysdev.h>
 #include <linux/bitops.h>
 
-#include <asm/8253pit.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 906bf5e8de89c568f243a7656fc82a3e93d8319c..4e2ca6f0ab188c520f39a6a2fc82f9d5332064a1 100644 (file)
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
-#include <asm/8253pit.h>
 #include <asm/io.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
@@ -28,6 +27,7 @@ MODULE_LICENSE("GPL");
 /* Use the global PIT lock ! */
 #include <asm/i8253.h>
 #else
+#include <asm/8253pit.h>
 static DEFINE_SPINLOCK(i8253_lock);
 #endif
 

diff --git a/include/asm-x86/8253pit.h b/include/asm-x86/8253pit.h
deleted file mode 100644 (file)
index d3c2b38..0000000
--- a/include/asm-x86/8253pit.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_X86_32
-# include "8253pit_32.h"
-#else
-# include "8253pit_64.h"
-#endif

diff --git a/include/asm-x86/8253pit_32.h b/include/asm-x86/8253pit_32.h
deleted file mode 100644 (file)
index 96c7c35..0000000
--- a/include/asm-x86/8253pit_32.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * 8253/8254 Programmable Interval Timer
- */
-
-#ifndef _8253PIT_H
-#define _8253PIT_H
-
-#include <asm/timex.h>
-
-#define PIT_TICK_RATE  CLOCK_TICK_RATE
-
-#endif

diff --git a/include/asm-x86/8253pit_64.h b/include/asm-x86/8253pit_64.h
deleted file mode 100644 (file)
index 285f784..0000000
--- a/include/asm-x86/8253pit_64.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * 8253/8254 Programmable Interval Timer
- */
-
-#ifndef _8253PIT_H
-#define _8253PIT_H
-
-#define PIT_TICK_RATE  1193182UL
-
-#endif

diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h
index 7eff6fd27474bcb60c5971c29f00bd9f2372f759..28cf67da59a3a536de426f8e1bc6b8f399f6b166 100644 (file)
--- a/include/asm-x86/i8253.h
+++ b/include/asm-x86/i8253.h
@@ -1,10 +1,6 @@
 #ifndef __ASM_I8253_H__
 #define __ASM_I8253_H__
 
-#ifdef CONFIG_X86_64
-# include <asm/8253pit.h>
-#endif
-
 /* i8253A PIT registers */
 #define PIT_MODE               0x43
 #define PIT_CH0                        0x40

diff --git a/include/asm-x86/timex_32.h b/include/asm-x86/timex_32.h
index 3666044409f06c6c2ec0c1ee6ba45d9dbeb1cd50..fa8839465bdbcecc94dbb8eae21220f35689f6d0 100644 (file)
--- a/include/asm-x86/timex_32.h
+++ b/include/asm-x86/timex_32.h
@@ -10,11 +10,11 @@
 #include <asm/tsc.h>
 
 #ifdef CONFIG_X86_ELAN
-#  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
+#  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */
 #else
-#  define CLOCK_TICK_RATE 1193182 /* Underlying HZ */
+#  define PIT_TICK_RATE 1193182 /* Underlying HZ */
 #endif
-
+#define CLOCK_TICK_RATE        PIT_TICK_RATE
 
 extern int read_current_timer(unsigned long *timer_value);
 #define ARCH_HAS_READ_CURRENT_TIMER    1

diff --git a/include/asm-x86/timex_64.h b/include/asm-x86/timex_64.h
index 6ed21f44d3084cc2ee2516b9f2b582ae9b543a5a..901bf89ce643f1b09888fa8c59af07395d14c6ec 100644 (file)
--- a/include/asm-x86/timex_64.h
+++ b/include/asm-x86/timex_64.h
@@ -6,7 +6,6 @@
 #ifndef _ASMx8664_TIMEX_H
 #define _ASMx8664_TIMEX_H
 
-#include <asm/8253pit.h>
 #include <asm/msr.h>
 #include <asm/vsyscall.h>
 #include <asm/system.h>
@@ -14,6 +13,7 @@
 #include <asm/tsc.h>
 #include <linux/compiler.h>
 
+#define PIT_TICK_RATE  1193182UL
 #define CLOCK_TICK_RATE        PIT_TICK_RATE   /* Underlying HZ */
 
 extern int read_current_timer(unsigned long *timer_value);