x86: Remove mca bus ifdef from timer interrupt

MCA_bus is constant 0 when CONFIG_MCA=n. So the compiler removes that
code w/o needing an extra #ifdef

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 7a26bcf887f6084f3e7c08c7d2cd4199010d43a8..ec729cdcfa3d4d2b3fa2596f4d0afa45882c2d4d 100644 (file)
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -78,21 +78,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
        global_clock_event->event_handler(global_clock_event);
 
-#ifdef CONFIG_MCA
-       if (MCA_bus) {
-               /* The PS/2 uses level-triggered interrupts.  You can't
-               turn them off, nor would you want to (any attempt to
-               enable edge-triggered interrupts usually gets intercepted by a
-               special hardware circuit).  Hence we have to acknowledge
-               the timer interrupt.  Through some incredibly stupid
-               design idea, the reset for IRQ 0 is done by setting the
-               high bit of the PPI port B (0x61).  Note that some PS/2s,
-               notably the 55SX, work fine if this is removed.  */
-
-               u8 irq_v = inb_p(0x61);         /* read the current state */
-               outb_p(irq_v | 0x80, 0x61);     /* reset the IRQ */
-       }
-#endif
+       /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
+       if (MCA_bus)
+               outb_p(inb_p(0x61)| 0x80, 0x61);
 
        return IRQ_HANDLED;
 }

diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 35e0a925da565750556582d38029362f776137c7..7db3912b8692801259dbcfd7e8c752f4a4ae9524 100644 (file)
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -67,12 +67,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
        global_clock_event->event_handler(global_clock_event);
 
-#ifdef CONFIG_MCA
-       if (MCA_bus) {
-               u8 irq_v = inb_p(0x61);       /* read the current state */
-               outb_p(irq_v|0x80, 0x61);     /* reset the IRQ */
-       }
-#endif
+       /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
+       if (MCA_bus)
+               outb_p(inb_p(0x61)| 0x80, 0x61);
 
        return IRQ_HANDLED;
 }