 @@ -1,14 +1,14 @@
-/*	$NetBSD: i82365.c,v 1.102 2008/04/08 12:07:26 cegger Exp $	*/
+/*	$NetBSD: i82365.c,v 1.102.14.1 2009/08/14 21:37:03 snj Exp $	*/
 /*
  * Copyright (c) 2004 Charles M. Hannum.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -39,27 +39,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.102 2008/04/08 12:07:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.102.14.1 2009/08/14 21:37:03 snj Exp $");
 #define	PCICDEBUG
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 @@ -387,68 +387,52 @@ pcic_power(why, arg)
+}
 /*
  * attach a socket -- we don't know about irqs yet
  */
 void
 pcic_attach_socket(h)
 	struct pcic_handle *h;
+{
 	struct pcmciabus_attach_args paa;
 	struct pcic_softc *sc = (struct pcic_softc *)h->ph_parent;
 	int locs[PCMCIABUSCF_NLOCS];
 	char cs[4];
 	/* initialize the rest of the handle */
 	h->shutdown = 0;
 	h->memalloc = 0;
 	h->ioalloc = 0;
 	h->ih_irq = 0;
 	/* now, config one pcmcia device per socket */
 	paa.paa_busname = "pcmcia";
 	paa.pct = (pcmcia_chipset_tag_t) sc->pct;
 	paa.pch = (pcmcia_chipset_handle_t) h;
 	paa.iobase = sc->iobase;
 	paa.iosize = sc->iosize;
 	locs[PCMCIABUSCF_CONTROLLER] = h->chip;
 	locs[PCMCIABUSCF_SOCKET] = h->socket;
 	h->pcmcia = config_found_sm_loc(&sc->dev, "pcmciabus", locs, &paa,
 					pcic_print, config_stdsubmatch);
 	if (h->pcmcia == NULL) {
 		h->flags &= ~PCIC_FLAG_SOCKETP;
 		return;
+	}
 	/*
 	 * queue creation of a kernel thread to handle insert/removal events.
 	 */
 #ifdef DIAGNOSTIC
 	if (h->event_thread != NULL)
 		panic("pcic_attach_socket: event thread");
 #endif
 	config_pending_incr();
 	snprintf(cs, sizeof(cs), "%d,%d", h->chip, h->socket);
 	if (kthread_create(PRI_NONE, 0, NULL, pcic_event_thread, h,
 	    &h->event_thread, "%s,%s", device_xname(h->ph_parent), cs)) {
 		aprint_error_dev(h->ph_parent, "unable to create event thread for sock 0x%02x\n", h->sock);
 		panic("pcic_attach_socket");
+}
 /*
  * now finish attaching the sockets, we are ready to allocate
  * interrupts
  */
 void
 pcic_attach_sockets_finish(sc)
 	struct pcic_softc *sc;
+{
 	int i;
 	for (i = 0; i < __arraycount(sc->handle); i++)
 @@ -456,26 +440,27 @@ pcic_attach_sockets_finish(sc)
 			pcic_attach_socket_finish(&sc->handle[i]);
+}
 /*
  * finishing attaching the socket.  Interrupts may now be on
  * if so expects the pcic interrupt to be blocked
  */
 void
 pcic_attach_socket_finish(h)
 	struct pcic_handle *h;
+{
 	struct pcic_softc *sc = (struct pcic_softc *)h->ph_parent;
 	int reg;
 	char cs[4];
 	DPRINTF(("%s: attach finish socket %ld\n", device_xname(h->ph_parent),
 	    (long) (h - &sc->handle[0])));
 	/*
 	 * Set up a powerhook to ensure it continues to interrupt on
 	 * card detect even after suspend.
 	 * (this works around a bug seen in suspend-to-disk on the
 	 * Sony VAIO Z505; on resume, the CSC_INTR state is not preserved).
 	 */
 	powerhook_establish(device_xname(h->ph_parent), pcic_power, h);
 	/* enable interrupts on card detect, poll for them if no irq avail */
 @@ -510,26 +495,42 @@ pcic_attach_socket_finish(h)
 			pcic_write(h, PCIC_CIRRUS_MISC_CTL_2, reg);
+		}
+	}
 	/* if there's a card there, then attach it. */
 	reg = pcic_read(h, PCIC_IF_STATUS);
 	if ((reg & PCIC_IF_STATUS_CARDDETECT_MASK) ==
 	    PCIC_IF_STATUS_CARDDETECT_PRESENT) {
 		pcic_queue_event(h, PCIC_EVENT_INSERTION);
 		h->laststate = PCIC_LASTSTATE_PRESENT;
 	} else {
 		h->laststate = PCIC_LASTSTATE_EMPTY;
+	}
 	/*
 	 * queue creation of a kernel thread to handle insert/removal events.
 	 */
 #ifdef DIAGNOSTIC
 	if (h->event_thread != NULL)
 		panic("pcic_attach_socket: event thread");
 #endif
 	config_pending_incr();
 	snprintf(cs, sizeof(cs), "%d,%d", h->chip, h->socket);
 	if (kthread_create(PRI_NONE, 0, NULL, pcic_event_thread, h,
 	    &h->event_thread, "%s,%s", device_xname(h->ph_parent), cs)) {
 		aprint_error_dev(h->ph_parent, "unable to create event thread for sock 0x%02x\n", h->sock);
 		panic("pcic_attach_socket");
+	}
+}
 void
 pcic_event_thread(arg)
 	void *arg;
+{
 	struct pcic_handle *h = arg;
 	struct pcic_event *pe;
 	int s, first = 1;
 	struct pcic_softc *sc = (struct pcic_softc *)h->ph_parent;
 	while (h->shutdown == 0) {
 		/*