Skip to contentSkip to conversation

Clean up

TRIVIAL Trivial Patch Monkey 1 participant 1 message Mar 12, 2004

lore
Share & tools
lore
#0 lore raw

From: Josef 'Jeff' Sipek <[email protected]>(by way of Jeff Sipek <[email protected]>)

---
I just noticed the nested ifdefs, and made it little more readable.

Josef 'Jeff' Sipek

arch/i386/kernel/irq.c renamed from arch/i386/kernel/irq.c.orig +2 -6
@@ -126,11 +126,9 @@
 };
 
 atomic_t irq_err_count;
-#ifdef CONFIG_X86_IO_APIC
-#ifdef APIC_MISMATCH_DEBUG
+#if defined(CONFIG_X86_IO_APIC) && defined(APIC_MISMATCH_DEBUG)
 atomic_t irq_mis_count;
 #endif
-#endif
 
 /*
  * Generic, controller-independent functions:
@@ -186,11 +184,9 @@
 		seq_putc(p, '\n');
 #endif
 		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
-#ifdef CONFIG_X86_IO_APIC
-#ifdef APIC_MISMATCH_DEBUG
+#if defined(CONFIG_X86_IO_APIC) && defined(APIC_MISMATCH_DEBUG)
 		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
 #endif
-#endif
 	}
 	return 0;
 }
Signature · 3 lines
  What is this? http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
  Don't blame me: the Monkey is driving
  File: Josef 'Jeff' Sipek <[email protected]>(by way of Jeff Sipek <[email protected]>): [PATCH] Clean up