 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $	*/
+/*	$NetBSD: i2c.c,v 1.26 2011/07/31 15:58:25 jmcneill Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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 WASABI SYSTEMS, INC
  * 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: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.26 2011/07/31 15:58:25 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <dev/i2c/i2cvar.h>
 @@ -109,26 +109,33 @@ iic_search(device_t parent, cfdata_t cf,
 	ia.ia_type = sc->sc_type;
 	ia.ia_name = NULL;
 	ia.ia_ncompat = 0;
 	ia.ia_compat = NULL;
 	if (config_match(parent, cf, &ia) > 0)
 		config_attach(parent, cf, &ia, iic_print);
 	return (0);
+}
 static int
 iic_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	config_search_ia(iic_search, self, ifattr, NULL);
 	return 0;
+}
 static int
 iic_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 static void
 iic_attach(device_t parent, device_t self, void *aux)
+{
 	struct iic_softc *sc = device_private(self);
 	struct i2cbus_attach_args *iba = aux;
 	prop_array_t child_devices;
 	char *buf;
 @@ -265,27 +272,27 @@ iic_attach(device_t parent, device_t sel
 			config_found_sm_loc(self, "iic", loc, &ia,
 			    iic_print_direct, NULL);
 			if (ia.ia_compat)
 				free(ia.ia_compat, M_TEMP);
 			if (buf)
 				free(buf, M_TEMP);
+		}
 	} else {
 		/*
 		 * Attach all i2c devices described in the kernel
 		 * configuration file.
 		 */
-		config_search_ia(iic_search, self, "iic", NULL);
+		iic_rescan(self, "iic", NULL);
+	}
+}
 static void
 iic_smbus_intr_thread(void *aux)
+{
 	i2c_tag_t ic;
 	struct ic_intr_list *il;
 	int rv;
 	ic = (i2c_tag_t)aux;
 	ic->ic_running = 1;
 	ic->ic_pending = 0;
 @@ -419,15 +426,15 @@ iic_compat_match(struct i2c_attach_args
+{
 	int i;
 	for (; compats && *compats; compats++) {
 		for (i = 0; i < ia->ia_ncompat; i++) {
 			if (strcmp(*compats, ia->ia_compat[i]) == 0)
 				return 1;
+		}
+	}
 	return 0;
+}
-CFATTACH_DECL_NEW(iic, sizeof(struct iic_softc),
+CFATTACH_DECL2_NEW(iic, sizeof(struct iic_softc),
-    iic_match, iic_attach, NULL, NULL);
+    iic_match, iic_attach, NULL, NULL, iic_rescan, NULL);