[parisc-linux-cvs] indenting cleanups
Helge Deller
deller@gmx.de
Sun, 4 Nov 2001 17:42:39 +0100
Index: irq.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/irq.h,v
retrieving revision 1.15
diff -u -p -r1.15 irq.h
--- irq.h 2001/11/04 14:17:32 1.15
+++ irq.h 2001/11/04 16:40:01
@@ -1,13 +1,5 @@
-#ifndef _ASM_IRQ_H
-#define _ASM_IRQ_H
-
-#include <linux/string.h>
-#include <asm/ptrace.h>
-#include <linux/interrupt.h>
-
-#include <asm/types.h>
/*
- * linux/include/asm/irq.h
+ * linux/include/asm-parisc/irq.h
*
* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar,
* Copyright 1999 SuSE GmbH
@@ -15,34 +7,40 @@
* IRQ/IPI changes taken from work by Thomas Radke
* <tomsoft@informatik.tu-chemnitz.de>
*/
+
+#ifndef _ASM_PARISC_IRQ_H
+#define _ASM_PARISC_IRQ_H
+
+#include <asm/ptrace.h>
+#include <asm/types.h>
+
+#include <linux/string.h>
+#include <linux/interrupt.h>
+
+
+#define CPU_IRQ_REGION 1
+#define TIMER_IRQ (IRQ_FROM_REGION(CPU_IRQ_REGION) | 0)
+#define IPI_IRQ (IRQ_FROM_REGION(CPU_IRQ_REGION) | 1)
+
+/* This should be 31 for PA1.1 binaries and 63 for PA-2.0 wide mode */
+#define MAX_CPU_IRQ (BITS_PER_LONG - 1)
+
+#if BITS_PER_LONG == 32
+# define IRQ_REGION_SHIFT 5
+#else
+# define IRQ_REGION_SHIFT 6
+#endif
-#define CPU_IRQ_REGION 1
-#define TIMER_IRQ (IRQ_FROM_REGION(CPU_IRQ_REGION) | 0)
-#define IPI_IRQ (IRQ_FROM_REGION(CPU_IRQ_REGION) | 1)
-
-/* This should be 31 for PA1.1 binaries and 63 for PA-2.0 wide mode) */
-#define MAX_CPU_IRQ (BITS_PER_LONG - 1)
-
-#if 1 /* set to 1 to get the new irq offsets, or ... */
-# if BITS_PER_LONG == 32
-# define IRQ_REGION_SHIFT 5
-# else
-# define IRQ_REGION_SHIFT 6
-# endif
-#else /* 256 irq-entries per region (wastes memory, maybe gains speed? :-))*/
-# define IRQ_REGION_SHIFT 8
-#endif
-
-#define IRQ_PER_REGION (1 << IRQ_REGION_SHIFT)
-#define NR_IRQ_REGS 16
-#define NR_IRQS (NR_IRQ_REGS * IRQ_PER_REGION)
+#define IRQ_PER_REGION (1 << IRQ_REGION_SHIFT)
+#define NR_IRQ_REGS 16
+#define NR_IRQS (NR_IRQ_REGS * IRQ_PER_REGION)
#define IRQ_REGION(irq) ((irq) >> IRQ_REGION_SHIFT)
#define IRQ_OFFSET(irq) ((irq) & ((1<<IRQ_REGION_SHIFT)-1))
#define IRQ_FROM_REGION(reg) ((reg) << IRQ_REGION_SHIFT)
-#define IRQ_REG_DIS 1 /* support disable_irq / enable_irq */
-#define IRQ_REG_MASK 2 /* require IRQs to be masked */
+#define IRQ_REG_DIS 1 /* support disable_irq()/enable_irq() */
+#define IRQ_REG_MASK 2 /* require IRQs to be masked */
struct irq_region_ops {
void (*disable_irq)(void *dev, int irq);
@@ -91,4 +89,4 @@ extern int txn_claim_irq(int);
extern unsigned int txn_alloc_data(int, unsigned int);
extern unsigned long txn_alloc_addr(int);
-#endif /* _ASM_IRQ_H */
+#endif /* _ASM_PARISC_IRQ_H */