From: Alexander Polakov <polachok@gmail.com>
Date: Sun, 8 Nov 2009 19:13:17 +0000 (+0300)
Subject: Remove extra debug messages, whitespace changes.
X-Git-Url: https://gitweb.dragonflybsd.org/~polachok/dragonfly.git/commitdiff_plain/newacpi

Remove extra debug messages, whitespace changes.
---

diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c
index fce68973b9..db6e1fbabf 100644
--- a/sys/dev/acpica5/acpi.c
+++ b/sys/dev/acpica5/acpi.c
@@ -1086,7 +1086,6 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	     *
 	     * XXX: Should we handle the lookup failing?
 	     */
-kprintf("%s(): %d\n", __FUNCTION__, __LINE__);
 	    if (ACPI_SUCCESS(acpi_lookup_irq_resource(child, *rid, res, &ares)))
 		acpi_config_intr(child, &ares);
 	    else
diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c
index a4d9096623..c337804a17 100644
--- a/sys/dev/acpica5/acpi_resource.c
+++ b/sys/dev/acpica5/acpi_resource.c
@@ -706,12 +706,12 @@ acpi_sysres_attach(device_t dev)
      * the rman pool.
      */
     bus = device_get_parent(dev);
-gparent = device_get_parent(bus);
+    gparent = device_get_parent(bus);
     dev_rl = BUS_GET_RESOURCE_LIST(bus, dev);
     bus_rl = BUS_GET_RESOURCE_LIST(device_get_parent(bus), bus);
-if(bus_rl)
-kprintf("busrl is not null!\n");
-    SLIST_FOREACH(dev_rle, dev_rl, link) {
+    if(bus_rl)
+        kprintf("busrl is not null!\n");
+        SLIST_FOREACH(dev_rle, dev_rl, link) {
 	if (dev_rle->type != SYS_RES_IOPORT && dev_rle->type != SYS_RES_MEMORY)
 	    continue;
 
diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c
index 7f3750dd8a..3990f96618 100644
--- a/sys/platform/pc32/apic/mpapic.c
+++ b/sys/platform/pc32/apic/mpapic.c
@@ -554,10 +554,10 @@ io_apic_setup_intpin(int apic, int pin)
 	if (cpuid > mp_naps)
 		cpuid = 0;
 
-	//if (bootverbose) {
+	if (bootverbose) {
 		kprintf("IOAPIC #%d intpin %d -> irq %d (CPU%d)\n",
 		       apic, pin, irq, cpuid);
-	//}
+	}
 
 	/*
 	 * Program the appropriate registers.  This routing may be 
diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c
index a5abb7d879..f021816447 100644
--- a/sys/platform/pc32/i386/nexus.c
+++ b/sys/platform/pc32/i386/nexus.c
@@ -481,9 +481,6 @@ nexus_config_intr(device_t dev, device_t child, int irq, enum intr_trigger trig,
 	int slot = pci_get_slot(child);
 	int bus = pci_get_bus(child);
 	int pin = irq + 1;
-	kprintf("%s(%s): irq: %d, trigger: %d, polarity: %d bus: %d slot: %d\n",
-		 __FUNCTION__, device_get_nameunit(child), irq, trig, pol,
-				 bus, slot);
 	line = pci_apic_irq(bus, slot, pin);
 	if(line >= 0)
 		return line;
@@ -491,9 +488,6 @@ nexus_config_intr(device_t dev, device_t child, int irq, enum intr_trigger trig,
 	if(line >= 0)
 		return line;
 
-        kprintf("MPTable: Unable to route for bus %d slot %d INT%c\n",
-                pci_get_bus(child), pci_get_slot(child), 'A' + pin - 1);
-
 	return PCI_INVALID_IRQ;
 #else
 	return irq;