 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.18.16.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.18.16.2 2010/01/12 18:21:17 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,76 +23,78 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18.16.1 2009/11/23 18:28:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18.16.2 2010/01/12 18:21:17 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <mips/locore.h>
 #include <mips/cache.h>
 #include <machine/cpu.h>
 #include <mips/sibyte/include/zbbusvar.h>
 #include <mips/sibyte/include/sb1250_regs.h>
 #include <mips/sibyte/include/sb1250_scd.h>
 #include <mips/sibyte/dev/sbscdvar.h>
 #define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(rp)))
-static int	cpu_match(struct device *, struct cfdata *, void *);
+static int	cpu_match(device_t, cfdata_t, void *);
-static void	cpu_attach(struct device *, struct device *, void *);
+static void	cpu_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 static int found = 0;
 static int
-cpu_match(struct device *parent, struct cfdata *match, void *aux)
+cpu_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct zbbus_attach_args *zap = aux;
 	int part;
 	if (zap->za_locs.za_type != ZBBUS_ENTTYPE_CPU)
 		return (0);
 	/*
 	 * The 3rd hex digit of the part number is the number of CPUs;
 	 * ref Table 26, p38 1250-UM101-R.
 	 */
 	part = G_SYS_PART(READ_REG(MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_REVISION)));
 	return (found < ((part >> 8) & 0xf));
+}
 static void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info * const ci = curcpu();
 	const char * const xname = device_xname(self);
 	int plldiv;
 	uint32_t config;
 	/* XXX this code must run on the target CPU */
 	config = mips3_cp0_config_read();
 	config &= ~MIPS3_CONFIG_K0_MASK;
 	config |= 0x05;				/* XXX.  cacheable coherent */
 	mips3_cp0_config_write(config);
 	found++;
 	/*
 	 * Flush all of the caches, so that any lines marked non-coherent will
 @@ -100,46 +102,46 @@ cpu_attach(struct device *parent, struct
 	 * coherent (XXX???).
 	 */
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
 	/* Determine CPU frequency */
 	/* XXX:  We should determine the CPU frequency from a time source
 	 *       not coupled with the CPU crystal, like the RTC.  Unfortunately
 	 *       we don't attach that yet...
 	 */
 	plldiv = G_SYS_PLL_DIV(READ_REG(MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_CFG)));
 	if (plldiv == 0) {
-		printf("PLL_DIV of zero found, assuming 6 (300MHz)\n");
+		aprint_normal(": PLL_DIV of zero found, assuming 6 (300MHz)\n");
 		plldiv = 6;
-		printf("%s", self->dv_xname);
+		aprint_normal("%s", xname);
+	}
-	curcpu()->ci_cpu_freq = 50000000 * plldiv;
+	ci->ci_cpu_freq = 50000000 * plldiv;
 	/* Compute the delay divisor. */
-	curcpu()->ci_divisor_delay = (curcpu()->ci_cpu_freq + 500000) / 1000000;
+	ci->ci_divisor_delay = (ci->ci_cpu_freq + 500000) / 1000000;
 	/* Compute clock cycles per hz */
-	curcpu()->ci_cycles_per_hz = (curcpu()->ci_cpu_freq + hz / 2 ) / hz;
+	ci->ci_cycles_per_hz = (ci->ci_cpu_freq + hz / 2 ) / hz;
-	printf(": %lu.%02luMHz (hz cycles = %lu, delay divisor = %lu)\n",
+	aprint_normal(": %lu.%02luMHz (hz cycles = %lu, delay divisor = %lu)\n",
-	    curcpu()->ci_cpu_freq / 1000000,
+	    ci->ci_cpu_freq / 1000000,
-	    (curcpu()->ci_cpu_freq % 1000000) / 10000,
+	    (ci->ci_cpu_freq % 1000000) / 10000,
-	    curcpu()->ci_cycles_per_hz, curcpu()->ci_divisor_delay);
+	    ci->ci_cycles_per_hz, ci->ci_divisor_delay);
 	/*
 	 * If we're the primary CPU, no more work to do; we're already
 	 * running!
 	 */
 	if (found == 1) {
-		printf("%s: ", self->dv_xname);
+		aprint_normal("%s: ", xname);
 		cpu_identify();
 	} else {
 #if defined(MULTIPROCESSOR)
 # error!
 #else
 		printf("%s: processor off-line; multiprocessor support "
-		    "not present in kernel\n", /* sc->sc_dev. */self->dv_xname);
+		    "not present in kernel\n", xname);
 #endif
+	}
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: rtc.c,v 1.16.38.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: rtc.c,v 1.16.38.2 2010/01/12 18:21:17 matt Exp $ */
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge 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,133 +26,134 @@
  * 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: rtc.c,v 1.16.38.1 2009/11/23 18:28:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16.38.2 2010/01/12 18:21:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <dev/clock_subr.h>
 #include <machine/swarm.h>
 #include <machine/systemsw.h>
 #include <mips/locore.h>
 #include <mips/sibyte/dev/sbsmbusvar.h>
 #include <dev/smbus/m41t81reg.h>
 #include <dev/smbus/x1241reg.h>
 struct rtc_softc {
-	struct device		sc_dev;
+	device_t		sc_dev;
 	int			sc_smbus_chan;
 	int			sc_smbus_addr;
 	int			sc_type;
 	struct todr_chip_handle	sc_ct;
 };
 /* "types" for RTCs we support */
 #define	SMB_1BYTE_ADDR	1
 #define	SMB_2BYTE_ADDR	2
-static int xirtc_match(struct device *, struct cfdata *, void *);
+static int xirtc_match(device_t, cfdata_t , void *);
-static void xirtc_attach(struct device *, struct device *, void *);
+static void xirtc_attach(device_t, device_t, void *);
 static int xirtc_gettime(todr_chip_handle_t, struct clock_ymdhms *);
 static int xirtc_settime(todr_chip_handle_t, struct clock_ymdhms *);
-static int strtc_match(struct device *, struct cfdata *, void *);
+static int strtc_match(device_t, cfdata_t , void *);
-static void strtc_attach(struct device *, struct device *, void *);
+static void strtc_attach(device_t, device_t, void *);
 static int strtc_gettime(todr_chip_handle_t, struct clock_ymdhms *);
 static int strtc_settime(todr_chip_handle_t, struct clock_ymdhms *);
 static void rtc_cal_timer(void);
 static void time_smbus_init(int);
 static int time_waitready(int);
 static int time_readrtc(int, int, int, int);
 static int time_writertc(int, int, int, int, int);
 #define	WRITERTC(sc, dev, val)	\
 	time_writertc((sc)->sc_smbus_chan, (sc)->sc_smbus_addr, (dev), (sc)->sc_type, (val))
 #define	READRTC(sc, dev)	\
 	time_readrtc((sc)->sc_smbus_chan, (sc)->sc_smbus_addr, (dev), (sc)->sc_type)
-CFATTACH_DECL(xirtc, sizeof(struct rtc_softc),
+CFATTACH_DECL_NEW(xirtc, sizeof(struct rtc_softc),
     xirtc_match, xirtc_attach, NULL, NULL);
-CFATTACH_DECL(m41t81rtc, sizeof(struct rtc_softc),
+CFATTACH_DECL_NEW(m41t81rtc, sizeof(struct rtc_softc),
     strtc_match, strtc_attach, NULL, NULL);
 static int rtcfound = 0;
 struct rtc_softc *the_rtc;
 /*
  * Xicor X1241 RTC support.
  */
 static int
-xirtc_match(struct device *parent, struct cfdata *cf, void *aux)
+xirtc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct smbus_attach_args *sa = aux;
 	int ret;
 	time_smbus_init(sa->sa_interface);
 	if ((sa->sa_interface != X1241_SMBUS_CHAN) ||
 	    (sa->sa_device != X1241_RTC_SLAVEADDR))
 		return (0);
 	ret = time_readrtc(sa->sa_interface, sa->sa_device, SMB_2BYTE_ADDR, X1241REG_SC);
 	if (ret < 0)
 		return (0);
 	return (!rtcfound);
+}
 static void
-xirtc_attach(struct device *parent, struct device *self, void *aux)
+xirtc_attach(device_t parent, device_t self, void *aux)
+{
 	struct smbus_attach_args *sa = aux;
-	struct rtc_softc *sc = (void *)self;
+	struct rtc_softc *sc = device_private(self);
 	rtcfound = 1;
 	the_rtc = sc;
 	sc->sc_dev = self;
 	sc->sc_smbus_chan = sa->sa_interface;
 	sc->sc_smbus_addr = sa->sa_device;
 	sc->sc_type = SMB_2BYTE_ADDR;	/* Two-byte register addresses on the Xicor */
 	/* Set up MI todr(9) stuff */
 	sc->sc_ct.cookie = sc;
 	sc->sc_ct.todr_settime_ymdhms = xirtc_settime;
 	sc->sc_ct.todr_gettime_ymdhms = xirtc_gettime;
 	todr_attach(&sc->sc_ct);
-	printf("\n");
+	aprint_normal("\n");
 	rtc_cal_timer();	/* XXX */
+}
 static int
 xirtc_settime(todr_chip_handle_t handle, struct clock_ymdhms *ymdhms)
+{
 	struct rtc_softc *sc = handle->cookie;
 	uint8_t year, y2k;
 	time_smbus_init(sc->sc_smbus_chan);
 	/* unlock writes to the CCR */
 	WRITERTC(sc, X1241REG_SR, X1241REG_SR_WEL);
 @@ -192,76 +193,77 @@ xirtc_gettime(todr_chip_handle_t handle,
 	y2k = READRTC(sc, X1241REG_Y2K);
 	ymdhms->dt_year = FROMBCD(y2k) * 100 + FROMBCD(year);
 	ymdhms->dt_sec = FROMBCD(READRTC(sc, X1241REG_SC));
 	ymdhms->dt_min = FROMBCD(READRTC(sc, X1241REG_MN));
 	hour = READRTC(sc, X1241REG_HR);
 	ymdhms->dt_hour = FROMBCD(hour & ~X1241REG_HR_MIL);
 	status = READRTC(sc, X1241REG_SR);
 	if (status & X1241REG_SR_RTCF) {
 		printf("%s: battery has failed, clock setting is not accurate\n",
-		    sc->sc_dev.dv_xname);
+		    device_xname(sc->sc_dev));
 		return (EIO);
+	}
 	return (0);
+}
 /*
  * ST M41T81 RTC support.
  */
 static int
-strtc_match(struct device *parent, struct cfdata *cf, void *aux)
+strtc_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct smbus_attach_args *sa = aux;
 	int ret;
 	if ((sa->sa_interface != M41T81_SMBUS_CHAN) ||
 	    (sa->sa_device != M41T81_SLAVEADDR))
 		return (0);
 	time_smbus_init(sa->sa_interface);
 	ret = time_readrtc(sa->sa_interface, sa->sa_device, SMB_1BYTE_ADDR, M41T81_SEC);
 	if (ret < 0)
 		return (0);
 	return (!rtcfound);
+}
 static void
-strtc_attach(struct device *parent, struct device *self, void *aux)
+strtc_attach(device_t parent, device_t self, void *aux)
+{
 	struct smbus_attach_args *sa = aux;
-	struct rtc_softc *sc = (void *)self;
+	struct rtc_softc *sc = device_private(self);
 	rtcfound = 1;
 	the_rtc = sc;
 	sc->sc_dev = self;
 	sc->sc_smbus_chan = sa->sa_interface;
 	sc->sc_smbus_addr = sa->sa_device;
 	sc->sc_type = SMB_1BYTE_ADDR;	/* One-byte register addresses on the ST */
 	/* Set up MI todr(9) stuff */
 	sc->sc_ct.cookie = sc;
 	sc->sc_ct.todr_settime_ymdhms = strtc_settime;
 	sc->sc_ct.todr_gettime_ymdhms = strtc_gettime;
 	todr_attach(&sc->sc_ct);
-	printf("\n");
+	aprint_normal("\n");
 	rtc_cal_timer();	/* XXX */
+}
 static int
 strtc_settime(todr_chip_handle_t handle, struct clock_ymdhms *ymdhms)
+{
 	struct rtc_softc *sc = handle->cookie;
 	uint8_t hour;
 	time_smbus_init(sc->sc_smbus_chan);
 	hour = TOBCD(ymdhms->dt_hour);
 	if (ymdhms->dt_year >= 2000)	/* Should be always true! */
 @@ -314,27 +316,27 @@ strtc_gettime(todr_chip_handle_t handle,
  */
 static void
 rtc_cal_timer(void)
+{
 	uint32_t ctrdiff[NITERS], startctr, endctr;
 	int sec, lastsec, i;
 	if (rtcfound == 0) {
 		printf("rtc_cal_timer before rtc attached\n");
 		return;
+	}
 return;	/* XXX XXX */
-	printf("%s: calibrating CPU clock", the_rtc->sc_dev.dv_xname);
+	printf("%s: calibrating CPU clock", device_xname(the_rtc->sc_dev));
 	/*
 	 * Run the loop an extra time to wait for the second to tick over
 	 * and to prime the cache.
 	 */
 	time_smbus_init(the_rtc->sc_smbus_chan);
 	sec = RTC_SECONDS(the_rtc);
 	endctr = mips3_cp0_count_read();
 	for (i = 0; i < NITERS; i++) {
 		int diff;
  again:
 @@ -363,27 +365,27 @@ return;	/* XXX XXX */
+	}
 	printf("\n");
 	/* Compute the number of cycles per second. */
 	curcpu()->ci_cpu_freq = ((ctrdiff[1] + ctrdiff[2]) / 2);
 	/* Compute the delay divisor. */
 	curcpu()->ci_divisor_delay = curcpu()->ci_cpu_freq / 1000000;
 	/* Compute clock cycles per hz */
 	curcpu()->ci_cycles_per_hz = curcpu()->ci_cpu_freq / hz;
 	printf("%s: timer calibration: %lu cycles/sec [(%u, %u)]\n",
-	    the_rtc->sc_dev.dv_xname, curcpu()->ci_cpu_freq,
+	    device_xname(the_rtc->sc_dev), curcpu()->ci_cpu_freq,
 	    ctrdiff[1], ctrdiff[2]);
+}
 #undef RTC_SECONDS
 /* XXX eville direct-access-to-the-device code follows... */
 /*
  * Copyright 2000,2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute

 @@ -1,14 +1,14 @@
-/* $NetBSD: zbbus.c,v 1.11 2005/12/11 12:18:51 christos Exp $ */
+/* $NetBSD: zbbus.c,v 1.11.96.1 2010/01/12 18:21:17 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,70 +23,69 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.11 2005/12/11 12:18:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.11.96.1 2010/01/12 18:21:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <mips/sibyte/include/zbbusvar.h>
 #include "locators.h"
-static int	zbbus_match(struct device *, struct cfdata *, void *);
+static int	zbbus_match(device_t, cfdata_t, void *);
-static void	zbbus_attach(struct device *, struct device *, void *);
+static void	zbbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(zbbus, sizeof(struct device),
+CFATTACH_DECL_NEW(zbbus, 0,
     zbbus_match, zbbus_attach, NULL, NULL);
 static int	zbbus_print(void *, const char *);
-static int	zbbus_submatch(struct device *, struct cfdata *,
+static int	zbbus_submatch(device_t, cfdata_t, const int *, void *);
 			       const int *, void *);
 static const char *zbbus_entity_type_name(enum zbbus_entity_type type);
 static int	zbbus_attached;
 static const struct zbbus_attach_locs sb1250_zbbus_devs[] = {
 	{	0, 	ZBBUS_ENTTYPE_CPU	},
 	{	1, 	ZBBUS_ENTTYPE_CPU	},
 	{	4, 	ZBBUS_ENTTYPE_SCD	},
 	{	2, 	ZBBUS_ENTTYPE_BRZ	},
 	{	3, 	ZBBUS_ENTTYPE_OBIO	},
 };
 static const int sb1250_zbbus_dev_count =
     sizeof sb1250_zbbus_devs / sizeof sb1250_zbbus_devs[0];
 static int
-zbbus_match(struct device *parent, struct cfdata *match, void *aux)
+zbbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (zbbus_attached)
 		return (0);
 	return 1;
+}
 static void
-zbbus_attach(struct device *parent, struct device *self, void *aux)
+zbbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct zbbus_attach_args za;
 	int i;
 	printf("\n");
 	zbbus_attached = 1;
 	sb1250_icu_init();
 	for (i = 0; i < sb1250_zbbus_dev_count; i++) {
 		memset(&za, 0, sizeof za);
 		za.za_locs = sb1250_zbbus_devs[i];
 		config_found_sm_loc(self, "zbbus", NULL, &za, zbbus_print,
 @@ -99,28 +98,27 @@ zbbus_attach(struct device *parent, stru
 int
 zbbus_print(void *aux, const char *pnp)
+{
 	struct zbbus_attach_args *zap = aux;
 	if (pnp)
 		aprint_normal("%s at %s",
 		    zbbus_entity_type_name(zap->za_locs.za_type), pnp);
 	aprint_normal(" busid %d", zap->za_locs.za_busid);
 	return (UNCONF);
+}
 static int
-zbbus_submatch(struct device *parent, struct cfdata *cf,
+zbbus_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
 	       const int *ldesc, void *aux)
+{
 	struct zbbus_attach_args *zap = aux;
 	if (cf->cf_loc[ZBBUSCF_BUSID] != ZBBUSCF_BUSID_DEFAULT &&
 	    cf->cf_loc[ZBBUSCF_BUSID] != zap->za_locs.za_busid)
 		return (0);
 	return (config_match(parent, cf, aux));
+}
 static const char *
 zbbus_entity_type_name(enum zbbus_entity_type type)
+{