patch-1.3.28 linux/arch/alpha/kernel/irq.c

• Lines: 103
• Date: Fri Sep 15 11:23:05 1995
• Orig file: v1.3.27/linux/arch/alpha/kernel/irq.c
• Orig date: Wed Sep 13 12:45:29 1995

diff -u --recursive --new-file v1.3.27/linux/arch/alpha/kernel/irq.c linux/arch/alpha/kernel/irq.c
@@ -31,13 +31,9 @@
   static unsigned char cache_804 = 0xef;
   static unsigned char cache_805 = 0xff;
   static unsigned char cache_806 = 0xff;
-# define NUM_IRQS	33
 #elif defined(CONFIG_ALPHA_EB66) || defined(CONFIG_ALPHA_EB64P)
   static unsigned char cache_26 = 0xdf;
   static unsigned char cache_27 = 0xff;
-# define NUM_IRQS	32
-#else
-# define NUM_IRQS	16
 #endif
 
 void disable_irq(unsigned int irq_nr)
@@ -103,7 +99,7 @@
 		cache_806 &= mask;
 		outb(cache_806, 0x806);
 #elif defined(CONFIG_ALPHA_EB66) || defined(CONFIG_ALPHA_EB64P)
-	} else if if (irq_nr < 24) {
+	} else if (irq_nr < 24) {
 		cache_26 &= mask;
 		outb(cache_26, 0x26);
 	} else {
@@ -124,14 +120,14 @@
 	const char *name;
 };
 
-static struct irqaction irq_action[NUM_IRQS];
+static struct irqaction irq_action[NR_IRQS];
 
 int get_irq_list(char *buf)
 {
 	int i, len = 0;
 	struct irqaction * action = irq_action;
 
-	for (i = 0 ; i < NUM_IRQS ; i++, action++) {
+	for (i = 0 ; i < NR_IRQS ; i++, action++) {
 		if (!action->handler)
 			continue;
 		len += sprintf(buf+len, "%2d: %8d %c %s\n",
@@ -225,7 +221,7 @@
 	struct irqaction * action;
 	unsigned long flags;
 
-	if (irq >= NUM_IRQS)
+	if (irq >= NR_IRQS)
 		return -EINVAL;
 	action = irq + irq_action;
 	if (action->handler)
@@ -251,7 +247,7 @@
 	struct irqaction * action = irq + irq_action;
 	unsigned long flags;
 
-	if (irq >= NUM_IRQS) {
+	if (irq >= NR_IRQS) {
 		printk("Trying to free IRQ%d\n", irq);
 		return;
 	}
@@ -310,7 +306,7 @@
 {
 	struct irqaction * action;
 
-	if ((unsigned) irq > NUM_IRQS) {
+	if ((unsigned) irq > NR_IRQS) {
 		printk("device_interrupt: unexpected interrupt %d\n", irq);
 		return;
 	}
@@ -473,7 +469,7 @@
 	device_interrupt(irq, ack, regs);
 }
 
-#if NUM_IRQS > 64
+#if NR_IRQS > 64
 #  error Number of irqs limited to 64 due to interrupt-probing.
 #endif
 
@@ -486,7 +482,7 @@
 	unsigned long delay;
 	unsigned int i;
 
-	for (i = NUM_IRQS - 1; i > 0; i--) {
+	for (i = NR_IRQS - 1; i > 0; i--) {
 		if (!irq_action[i].handler) {
 			enable_irq(i);
 			irqs |= (1 << i);
@@ -505,7 +501,7 @@
 		    (((unsigned long)cache_806)<<24));
 #elif defined(CONFIG_ALPHA_EB66) || defined(CONFIG_ALPHA_EB64P)
 	irqmask |= ((((unsigned long)cache_26)<<16) |
-		    (((unsigned long)cache_27)<<24);
+		    (((unsigned long)cache_27)<<24));
 #endif
 	irqs &= ~irqmask;
 	return irqs;
@@ -528,7 +524,7 @@
 		    (((unsigned long)cache_806)<<24));
 #elif defined(CONFIG_ALPHA_EB66) || defined(CONFIG_ALPHA_EB64P)
 	irqmask |= ((((unsigned long)cache_26)<<16) |
-		    (((unsigned long)cache_27)<<24);
+		    (((unsigned long)cache_27)<<24));
 #endif
 	irqs &= irqmask;
 	if (!irqs)