Commit 4f6f3bac authored by Pavel Machek's avatar Pavel Machek Committed by Thomas Gleixner
Browse files

x86: i8259.c: remove trivial ifdefs 



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

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Cc: macro@ds2.pg.gda.pl
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6b4d3afb

arch/x86/kernel/i8259.c

+3 −17
Original line number Diff line number Diff line
@@ -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);

		 /* 'Specific EOI' to master-IRQ2 */

		outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD);

#endif /* CONFIG_X86_64 */

	} 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 */

	}

	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);