 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.69 2010/11/24 14:56:18 cegger Exp $	*/
+/*	$NetBSD: intr.c,v 1.70 2011/01/22 14:01:27 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -123,27 +123,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)isa.c	7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.69 2010/11/24 14:56:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.70 2011/01/22 14:01:27 tsutsui Exp $");
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 @@ -684,86 +684,87 @@ intr_establish(int legacy_irq, struct pi
 	       int (*handler)(void *), void *arg, bool known_mpsafe)
+{
 	struct intrhand **p, *q, *ih;
 	struct cpu_info *ci;
 	int slot, error, idt_vec;
 	struct intrsource *source;
 #ifdef MULTIPROCESSOR
 	bool mpsafe = (known_mpsafe || level != IPL_VM);
 #endif /* MULTIPROCESSOR */
 	uint64_t where;
 #ifdef DIAGNOSTIC
 	if (legacy_irq != -1 && (legacy_irq < 0 || legacy_irq > 15))
-		panic("intr_establish: bad legacy IRQ value");
+		panic("%s: bad legacy IRQ value", __func__);
 	if (legacy_irq == -1 && pic == &i8259_pic)
 		panic("intr_establish: non-legacy IRQ on i8259");
 #endif
 	ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
 	if (ih == NULL) {
-		printf("intr_establish: can't allocate handler info\n");
+		printf("%s: can't allocate handler info\n", __func__);
 		return NULL;
+	}
 	mutex_enter(&cpu_lock);
 	error = intr_allocate_slot(pic, pin, level, &ci, &slot, &idt_vec);
 	if (error != 0) {
 		mutex_exit(&cpu_lock);
 		kmem_free(ih, sizeof(*ih));
 		printf("failed to allocate interrupt slot for PIC %s pin %d\n",
 		    pic->pic_name, pin);
 		return NULL;
+	}
 	source = ci->ci_isources[slot];
 	if (source->is_handlers != NULL &&
 	    source->is_pic->pic_type != pic->pic_type) {
 		mutex_exit(&cpu_lock);
 		kmem_free(ih, sizeof(*ih));
-		printf("intr_establish: can't share intr source between "
+		printf("%s: can't share intr source between "
 		       "different PIC types (legacy_irq %d pin %d slot %d)\n",
-		    legacy_irq, pin, slot);
+		    __func__, legacy_irq, pin, slot);
 		return NULL;
+	}
 	source->is_pin = pin;
 	source->is_pic = pic;
 	switch (source->is_type) {
 	case IST_NONE:
 		source->is_type = type;
 		break;
 	case IST_EDGE:
 	case IST_LEVEL:
 		if (source->is_type == type)
 			break;
 		/* FALLTHROUGH */
 	case IST_PULSE:
 		if (type != IST_NONE) {
 			mutex_exit(&cpu_lock);
 			kmem_free(ih, sizeof(*ih));
 			intr_source_free(ci, slot, pic, idt_vec);
-			printf("intr_establish: pic %s pin %d: can't share "
+			printf("%s: pic %s pin %d: can't share "
-			       "type %d with %d\n", pic->pic_name, pin,
+			       "type %d with %d\n",
 				__func__, pic->pic_name, pin,
 				source->is_type, type);
 			return NULL;
+		}
 		break;
 	default:
-		panic("intr_establish: bad intr type %d for pic %s pin %d\n",
+		panic("%s: bad intr type %d for pic %s pin %d\n",
-		    source->is_type, pic->pic_name, pin);
+		    __func__, source->is_type, pic->pic_name, pin);
 		/* NOTREACHED */
+	}
 	/*
 	 * We're now committed.  Mask the interrupt in hardware and
 	 * count it for load distribution.
 	 */
 	(*pic->pic_hwmask)(pic, pin);
 	(ci->ci_nintrhand)++;
 	/*
 	 * Figure out where to put the handler.
 	 * This is O(N^2), but we want to preserve the order, and N is
 @@ -849,27 +850,27 @@ intr_disestablish_xcall(void *arg1, void
 	idtvec = source->is_idtvec;
 	(*pic->pic_hwmask)(pic, ih->ih_pin);
 	atomic_and_32(&ci->ci_ipending, ~(1 << ih->ih_slot));
 	/*
 	 * Remove the handler from the chain.
 	 */
 	for (p = &source->is_handlers; (q = *p) != NULL && q != ih;
 	     p = &q->ih_next)
+		;
 	if (q == NULL) {
 		x86_write_psl(psl);
-		panic("intr_disestablish: handler not registered");
+		panic("%s: handler not registered", __func__);
 		/* NOTREACHED */
+	}
 	*p = q->ih_next;
 	intr_calculatemasks(ci);
 	(*pic->pic_delroute)(pic, ci, ih->ih_pin, idtvec, source->is_type);
 	(*pic->pic_hwunmask)(pic, ih->ih_pin);
 	/* Re-enable interrupts. */
 	x86_write_psl(psl);
 	/* If the source is free we can drop it now. */
 @@ -909,27 +910,27 @@ intr_disestablish(struct intrhand *ih)
 	mutex_exit(&cpu_lock);
 	kmem_free(ih, sizeof(*ih));
+}
 const char *
 intr_string(int ih)
+{
 	static char irqstr[64];
 #if NIOAPIC > 0
 	struct ioapic_softc *pic;
 #endif
 	if (ih == 0)
-		panic("pci_intr_string: bogus handle 0x%x", ih);
+		panic("%s: bogus handle 0x%x", __func__, ih);
 #if NIOAPIC > 0
 	if (ih & APIC_INT_VIA_APIC) {
 		pic = ioapic_find(APIC_IRQ_APIC(ih));
 		if (pic != NULL) {
 			snprintf(irqstr, sizeof(irqstr), "%s pin %d",
 			    device_xname(pic->sc_dev), APIC_IRQ_PIN(ih));
 		} else {
 			snprintf(irqstr, sizeof(irqstr),
 			    "apic %d int %d (irq %d)",
 			    APIC_IRQ_APIC(ih),
 			    APIC_IRQ_PIN(ih),