diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:08:30 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-07-01 04:37:15 -0400 |
commit | 01898e3e29ea8242d81923da11ce88ba71290a48 (patch) | |
tree | 5d2d64dfa8ef3a5e02d9593c2a816d3ab85064d3 | |
parent | 8560a6cfc9818edde1fd8677961714b264ffa03d (diff) |
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
-rw-r--r-- | arch/x86/kernel/apm_32.c | 6 | ||||
-rw-r--r-- | include/linux/i8253.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index a30740e6890e..0371c484bb8a 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -1220,11 +1220,11 @@ static void reinit_timer(void) | |||
1220 | 1220 | ||
1221 | raw_spin_lock_irqsave(&i8253_lock, flags); | 1221 | raw_spin_lock_irqsave(&i8253_lock, flags); |
1222 | /* set the clock to HZ */ | 1222 | /* set the clock to HZ */ |
1223 | outb_pit(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ | 1223 | outb_p(0x34, PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ |
1224 | udelay(10); | 1224 | udelay(10); |
1225 | outb_pit(LATCH & 0xff, PIT_CH0); /* LSB */ | 1225 | outb_p(LATCH & 0xff, PIT_CH0); /* LSB */ |
1226 | udelay(10); | 1226 | udelay(10); |
1227 | outb_pit(LATCH >> 8, PIT_CH0); /* MSB */ | 1227 | outb_p(LATCH >> 8, PIT_CH0); /* MSB */ |
1228 | udelay(10); | 1228 | udelay(10); |
1229 | raw_spin_unlock_irqrestore(&i8253_lock, flags); | 1229 | raw_spin_unlock_irqrestore(&i8253_lock, flags); |
1230 | #endif | 1230 | #endif |
diff --git a/include/linux/i8253.h b/include/linux/i8253.h index 487d50c7db39..e6bb36a97519 100644 --- a/include/linux/i8253.h +++ b/include/linux/i8253.h | |||
@@ -20,9 +20,6 @@ | |||
20 | 20 | ||
21 | #define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ) | 21 | #define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ) |
22 | 22 | ||
23 | #define inb_pit inb_p | ||
24 | #define outb_pit outb_p | ||
25 | |||
26 | extern raw_spinlock_t i8253_lock; | 23 | extern raw_spinlock_t i8253_lock; |
27 | extern struct clock_event_device i8253_clockevent; | 24 | extern struct clock_event_device i8253_clockevent; |
28 | extern void clockevent_i8253_init(bool oneshot); | 25 | extern void clockevent_i8253_init(bool oneshot); |