i8253: Cleanup outb/inb magic

Remove the hysterical outb/inb_pit defines and use outb_p/inb_p in the
code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20110609130622.348437125@linutronix.de

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index a30740e6890efe63997680665b7bdf56fa97fbf7..0371c484bb8a38dfcd230ec6d7a58c4c62df3fdd 100644 (file)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1220,11 +1220,11 @@ static void reinit_timer(void)
 
        raw_spin_lock_irqsave(&i8253_lock, flags);
        /* set the clock to HZ */
-       outb_pit(0x34, PIT_MODE);               /* binary, mode 2, LSB/MSB, ch 0 */
+       outb_p(0x34, PIT_MODE);         /* binary, mode 2, LSB/MSB, ch 0 */
        udelay(10);
-       outb_pit(LATCH & 0xff, PIT_CH0);        /* LSB */
+       outb_p(LATCH & 0xff, PIT_CH0);  /* LSB */
        udelay(10);
-       outb_pit(LATCH >> 8, PIT_CH0);  /* MSB */
+       outb_p(LATCH >> 8, PIT_CH0);    /* MSB */
        udelay(10);
        raw_spin_unlock_irqrestore(&i8253_lock, flags);
 #endif

diff --git a/include/linux/i8253.h b/include/linux/i8253.h
index 487d50c7db39fd9b7dc8743f802c81c08a7ec015..e6bb36a97519b00f1aa5e438dc2f72501f93c682 100644 (file)
--- a/include/linux/i8253.h
+++ b/include/linux/i8253.h
@@ -20,9 +20,6 @@
 
 #define PIT_LATCH      ((PIT_TICK_RATE + HZ/2) / HZ)
 
-#define inb_pit         inb_p
-#define outb_pit        outb_p
-
 extern raw_spinlock_t i8253_lock;
 extern struct clock_event_device i8253_clockevent;
 extern void clockevent_i8253_init(bool oneshot);