patch-2.4.0-test2 linux/arch/sparc/kernel/ebus.c

• Lines: 36
• Date: Thu Jun 22 07:21:12 2000
• Orig file: v2.4.0-test1/linux/arch/sparc/kernel/ebus.c
• Orig date: Fri Jan 28 15:09:07 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/sparc/kernel/ebus.c linux/arch/sparc/kernel/ebus.c
@@ -1,4 +1,4 @@
-/* $Id: ebus.c,v 1.9 2000/01/22 07:35:25 zaitcev Exp $
+/* $Id: ebus.c,v 1.10 2000/06/20 01:10:00 anton Exp $
  * ebus.c: PCI to EBus bridge device.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -127,13 +127,13 @@
 	if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_name)) != 0) {
 		dev->num_irqs = 1;
 	} else if ((len = prom_getproperty(node, "interrupts",
-	    (char *)&irqs, sizeof(irqs)) == -1) || (len == 0)) {
+	    (char *)&irqs, sizeof(irqs))) == -1 || len == 0) {
 		dev->num_irqs = 0;
 		dev->irqs[0] = 0;
 		if (dev->parent->num_irqs != 0) {
 			dev->num_irqs = 1;
 			dev->irqs[0] = dev->parent->irqs[0];
-/* P3 remove */ printk("EBUS: dev %s irq %d from parent\n", dev->prom_name, dev->irqs[0]);
+/* P3 */ /* printk("EBUS: dev %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */
 		}
 	} else {
 		dev->num_irqs = len / sizeof(irqs[0]);
@@ -219,11 +219,11 @@
 	if ((dev->irqs[0] = ebus_blacklist_irq(dev->prom_name)) != 0) {
 		dev->num_irqs = 1;
 	} else if ((len = prom_getproperty(node, "interrupts",
-	    (char *)&irqs, sizeof(irqs)) == -1) || (len == 0)) {
+	    (char *)&irqs, sizeof(irqs))) == -1 || len == 0) {
 		dev->num_irqs = 0;
 		if ((dev->irqs[0] = dev->bus->self->irq) != 0) {
 			 dev->num_irqs = 1;
-/* P3 remove */ printk("EBUS: child %s irq %d from parent\n", dev->prom_name, dev->irqs[0]);
+/* P3 */ /* printk("EBUS: child %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */
 		}
 	} else {
 		dev->num_irqs = 1;  /* dev->num_irqs = len / sizeof(irqs[0]); */