lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: i8259.c: remove trivial ifdefs

Browse Source 
Remove #ifdefs where the only difference is formatting of comments.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: macro@ds2.pg.gda.pl
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Pavel Machek 2008-05-21 11:52:52 +02:00 committed by Thomas Gleixner
parent 15d613cb25
commit 3e8631d270
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/i8259.c
View File

@ -175,24 +175,14 @@ static void mask_and_ack_8259A(unsigned int irq)
if (irq & 8) {
inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */
outb(cached_slave_mask, PIC_SLAVE_IMR);
#ifndef CONFIG_X86_64
outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */
outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
#else /* CONFIG_X86_64 */
/* 'Specific EOI' to slave */
outb(0x60+(irq&7),PIC_SLAVE_CMD);
outb(0x60+(irq&7), PIC_SLAVE_CMD);
/* 'Specific EOI' to master-IRQ2 */
outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD);
#endif /* CONFIG_X86_64 */
outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD);
} else {
inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */
outb(cached_master_mask, PIC_MASTER_IMR);
#ifndef CONFIG_X86_64
outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */
#else /* CONFIG_X86_64 */
/* 'Specific EOI' to master */
outb(0x60+irq,PIC_MASTER_CMD);
#endif /* CONFIG_X86_64 */
outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */
}
spin_unlock_irqrestore(&i8259A_lock, flags);
return;
@ -215,12 +205,8 @@ static void mask_and_ack_8259A(unsigned int irq)
* lets ACK and report it. [once per IRQ]
*/
if (!(spurious_irq_mask & irqmask)) {
#ifndef CONFIG_X86_64
printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
#else /* CONFIG_X86_64 */
printk(KERN_DEBUG
"spurious 8259A interrupt: IRQ%d.\n", irq);
#endif /* CONFIG_X86_64 */
spurious_irq_mask |= irqmask;
}
atomic_inc(&irq_err_count);