[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-01898e3e29ea8242d81923da11ce88ba71290a48@git.kernel.org>
Date: Fri, 1 Jul 2011 08:41:43 GMT
From: tip-bot for Thomas Gleixner <tglx@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, john.stultz@...aro.org,
hpa@...or.com, mingo@...hat.com, ralf@...ux-mips.org,
linux@....linux.org.uk, tglx@...utronix.de
Subject: [tip:timers/cleanup] i8253: Cleanup outb/inb magic
Commit-ID: 01898e3e29ea8242d81923da11ce88ba71290a48
Gitweb: http://git.kernel.org/tip/01898e3e29ea8242d81923da11ce88ba71290a48
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Thu, 9 Jun 2011 13:08:30 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 1 Jul 2011 10:37:15 +0200
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@...utronix.de>
Cc: Russell King <linux@....linux.org.uk>
Cc: Ralf Baechle <ralf@...ux-mips.org>
Cc: John Stultz <john.stultz@...aro.org>
Link: http://lkml.kernel.org/r/20110609130622.348437125@linutronix.de
---
arch/x86/kernel/apm_32.c | 6 +++---
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 a30740e..0371c48 100644
--- 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 487d50c..e6bb36a 100644
--- 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists