 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx31_icu.c,v 1.7 2012/10/27 17:17:39 chs Exp $	*/
+/*	$NetBSD: imx31_icu.c,v 1.8 2022/02/12 03:24:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * 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
 @@ -18,27 +18,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.7 2012/10/27 17:17:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,v 1.8 2022/02/12 03:24:34 riastradh Exp $");
 #define _INTR_PRIVATE
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/evcnt.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <uvm/uvm_extern.h>
 #include <machine/intr.h>
 @@ -215,27 +215,27 @@ avic_match(device_t parent, cfdata_t sel
 		return 0;
 	return 1;
+}
 void
 avic_attach(device_t parent, device_t self, void *aux)
+{
 	struct avic_softc * const avic = device_private(self);
 	struct ahb_attach_args * const ahba = aux;
 	int error;
 	KASSERT(ahba->ahba_irqbase != AHBCF_IRQBASE_DEFAULT);
-	KASSERT(self->dv_unit == 0);
+	KASSERT(device_unit(self) == 0);
 	if (ahba->ahba_size == AHBCF_SIZE_DEFAULT)
 		ahba->ahba_size = INTC_SIZE;
 	avic->avic_memt = ahba->ahba_memt;
 	error = bus_space_map(avic->avic_memt, ahba->ahba_addr, ahba->ahba_size,
 , &avic->avic_memh);
 	if (error)
 		panic("avic_attach: failed to map register %#lx-%#lx: %d",
 		    ahba->ahba_addr, ahba->ahba_addr + ahba->ahba_size - 1,
 		    error);
 	avic->avic_pic.pic_ops = &avic_pic_ops;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx51_tzic.c,v 1.7 2014/07/25 07:49:56 hkenken Exp $	*/
+/*	$NetBSD: imx51_tzic.c,v 1.8 2022/02/12 03:24:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <ryo@nerv.org>
  * 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.
 @@ -16,27 +16,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: imx51_tzic.c,v 1.7 2014/07/25 07:49:56 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c,v 1.8 2022/02/12 03:24:34 riastradh Exp $");
 #define	_INTR_PRIVATE	/* for arm/pic/picvar.h */
 #include "opt_imx.h"
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/evcnt.h>
 #include <sys/device.h>
 #include <sys/atomic.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 @@ -114,27 +114,27 @@ tzic_match(device_t parent, cfdata_t sel
 		return 0;
 	return 1;
+}
 void
 tzic_attach(device_t parent, device_t self, void *aux)
+{
 	struct tzic_softc *tzic = device_private(self);
 	struct axi_attach_args * const aa = aux;
 	int error;
 	KASSERT(aa->aa_irqbase != AXICF_IRQBASE_DEFAULT);
-	KASSERT(self->dv_unit == 0);
+	KASSERT(device_unit(self) == 0);
 	aprint_normal(": TrustZone Interrupt Controller\n");
 	aprint_naive("\n");
 	tzic->sc_dev = self;
 	tzic->sc_iot = aa->aa_iot;
 	tzic_softc = tzic;
 	if (aa->aa_size == AXICF_SIZE_DEFAULT)
 		aa->aa_size = TZIC_SIZE;
 	error = bus_space_map(tzic->sc_iot, aa->aa_addr, aa->aa_size, 0, &tzic->sc_ioh);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.9 2020/08/17 06:23:01 simonb Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.10 2022/02/12 03:24:34 riastradh 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,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: autoconf.c,v 1.9 2020/08/17 06:23:01 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2022/02/12 03:24:34 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <net/if_ether.h>
 #include <mips/cpu.h>
 #include <mips/locore.h>
 #include <evbmips/cavium/octeon_uboot.h>
 @@ -162,27 +162,27 @@ prop_set_cnmac(device_t dev)
 	enaddr[4] = (mac_lo >> 8) & 0xff;
 	enaddr[5] = mac_lo & 0xff;
 	pd = prop_data_create_copy(enaddr, ETHER_ADDR_LEN);
 	KASSERT(pd != NULL);
 	prop_dictionary_set_and_rel(dict, "mac-address", pd);
 	/* ethernet phy address */
 	switch (octeon_btinfo.obt_board_type) {
 	case BOARD_TYPE_UBIQUITI_E100:
 	case BOARD_TYPE_UBIQUITI_E120:
 		pn = prop_number_create_signed(7 - unit);
 		break;
 	case BOARD_TYPE_UBIQUITI_E300:
-		pn = prop_number_create_signed(4 + dev->dv_unit);
+		pn = prop_number_create_signed(4 + device_unit(dev));
 		break;
 	default:
 		pn = prop_number_create_signed(-1);
 		break;
+	}
 	KASSERT(pn != NULL);
 	prop_dictionary_set_and_rel(dict, "phy-addr", pn);
+}
 static void
 prop_set_octeon_gmx(device_t dev)
+{
 	prop_dictionary_t dict = device_properties(dev);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_le_oioc.c,v 1.5 2015/06/11 08:22:09 matt Exp $	*/
+/*	$NetBSD: if_le_oioc.c,v 1.6 2022/02/12 03:24:34 riastradh Exp $	*/
 /*
  * Copyright (c) 2009 Stephen M. Rumble
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * 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: if_le_oioc.c,v 1.5 2015/06/11 08:22:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_oioc.c,v 1.6 2022/02/12 03:24:34 riastradh Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>	// for uvm_pglistalloc
 #include <net/if.h>
 @@ -78,29 +78,29 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_oioc.c
+ *
  * Lance is somewhat nasty MI code. We basically get:
  *	struct le_softc {
  *		struct am7990_softc {
  *			struct lance_softc {
  *				device_t sc_dev;
  *				...
  *			}
  * 		}
+ *
  *		bus_space_tag ...
  *	}
+ *
- * So, we can cast any three to any other three, plus sc_dev->dv_private points
+ * So, we can cast any three to any other three, plus
- * back at the top (i.e. to le_softc, am7990_softc and lance_softc). Bloody
+ * device_private(sc_dev) points back at the top (i.e. to le_softc,
- * hell!
+ * am7990_softc and lance_softc). Bloody hell!
  */
 struct le_softc {
 	struct	am7990_softc sc_am7990;		/* glue to MI code */
 	bus_space_tag_t      sc_st;
 	bus_space_handle_t   sc_maph;		/* ioc<->lance page map regs */
 	bus_space_handle_t   sc_rdph;		/* lance rdp */
 	bus_space_handle_t   sc_raph;		/* lance rap */
 };
 static int	le_match(device_t, cfdata_t, void *);
 static void	le_attach(device_t, device_t, void *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lcg.c,v 1.7 2021/08/07 16:19:07 thorpej Exp $ */
+/*	$NetBSD: lcg.c,v 1.8 2022/02/12 03:24:35 riastradh Exp $ */
 /*
  * LCG accelerated framebuffer driver
  * Copyright (c) 2003, 2004 Blaz Antonic
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Resurrection and dumb framebuffer mode by Björn Johannesson
  * rherdware@yahoo.com in December 2014
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.7 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.8 2022/02/12 03:24:35 riastradh Exp $");
 #define LCG_NO_ACCEL
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/time.h>
 #include <sys/kmem.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 @@ -981,27 +981,28 @@ lcg_init_common(struct device *self, str
 	void *fifo_mem_vaddr;
 #ifndef LCG_NO_ACCEL
 	u_char line;
 	u_int ch, temp;
 #endif
 	if (regaddr != NULL)
 		return;
 	/* map LCG registers first */
 	if (self != NULL) {
 		regaddr = (long*)vax_map_physmem(LCG_REG_ADDR, (LCG_REG_SIZE/VAX_NBPG));
 		if (regaddr == 0) {
-			printf("%s: Couldn't allocate register memory.\n", self->dv_xname);
+			device_printf(self,
 			    "Couldn't allocate register memory.\n");
 			return;
+		}
 	} else {
 		regaddr = (long*)virtual_avail;
 		virtual_avail += LCG_REG_SIZE;
 		ioaccess((vaddr_t)regaddr, LCG_REG_ADDR, (LCG_REG_SIZE/VAX_NBPG));
+	}
 	/*
 	 * v = *0x200f0010 & VLC ? 0x07 : 0xf0;
 	 * switch(v) {
 	 * 0x05: 1280x1024
 	 * 0x06: conf & 0x80 ? 1024x768 : 640x480
 @@ -1051,125 +1052,135 @@ lcg_init_common(struct device *self, str
 	case 0x20:		/* KA46 1024x864 */
 	case 0x60:		/* KA46 1024x864 */
 		lcg_xsize = 1024;
 		lcg_ysize = 864;
 		break;
 	case 0x40:		/* KA46 1024x768 */
 		lcg_xsize = 1024;
 		lcg_ysize = 768;
 		break;
 	default:
 		panic("LCG model not supported");
+	}
 	if (self != NULL)
-		aprint_normal("%s: framebuffer size %dx%d, depth %d (magic 0x%x)\n",
+		aprint_normal_dev(self,
-			self->dv_xname, lcg_xsize, lcg_ysize, lcg_depth, magic);
+		    "framebuffer size %dx%d, depth %d (magic 0x%x)\n",
 		    lcg_xsize, lcg_ysize, lcg_depth, magic);
 	wsfont_init();
 	cookie = wsfont_find(NULL, 12, 22, 0, WSDISPLAY_FONTORDER_R2L,
 	    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie == -1)
 		cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
 				WSFONT_FIND_BITMAP);
 	if (cookie == -1)
 		cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
 		    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie == -1 || wsfont_lock(cookie, &wf))
 		panic("lcg_common_init: can't load console font");
 	lcg_font = *wf;
 	lcg_cols = lcg_xsize / lcg_font.fontwidth;
 	lcg_rows = lcg_ysize / lcg_font.fontheight;
 	if (self != NULL) {
-		aprint_normal("%s: using font %s (%dx%d), ", self->dv_xname, lcg_font.name,
+		aprint_normal_dev(self, "using font %s (%dx%d), ",
-				lcg_font.fontwidth, lcg_font.fontheight);
+		    lcg_font.name,
 		    lcg_font.fontwidth, lcg_font.fontheight);
 		aprint_normal("console size: %dx%d\n", lcg_cols, lcg_rows);
+	}
 	lcg_onerow = lcg_xsize * lcg_font.fontheight;
 	lcg_fb_size = lcg_xsize * lcg_ysize;
 	lcg_stdscreen.ncols = lcg_cols;
 	lcg_stdscreen.nrows = lcg_rows;
 	lcg_stdscreen.fontwidth = lcg_font.fontwidth;
 	lcg_stdscreen.fontheight = lcg_font.fontheight;
 	lcg_glyph_size = lcg_font.stride * lcg_font.fontheight;
 	snprintf(lcg_stdscreen_name, sizeof(lcg_stdscreen_name), "%dx%d", lcg_cols, lcg_rows);
 	qf = lcg_font.data;
 	qf2 = (u_short *)lcg_font.data;
 	if (self != NULL) {
 		lcgaddr = (void *)vax_map_physmem(va->va_paddr,
 					((lcg_fb_size + LCG_FONT_STORAGE_SIZE)/VAX_NBPG));
 		if (lcgaddr == 0) {
-			printf("%s: unable to allocate framebuffer memory.\n", self->dv_xname);
+			device_printf(self,
 			    "unable to allocate framebuffer memory.\n");
 			return;
+		}
 #ifndef LCG_NO_ACCEL
 		fontaddr = lcgaddr + lcg_fb_size;
 		/* copy font bitmaps */
 		for (ch = 0; ch < 256; ch++)
 			for (line = 0; line < lcg_font.fontheight; line++) {
 				temp = QFONT(ch, line);
 				if (lcg_font.stride == 1)
 					fontaddr[(ch * lcg_font.fontheight) + line] = temp;
 				else {
 					/* stride == 2 */
 					fontaddr[(ch * lcg_font.stride * lcg_font.fontheight) + line] = temp & 0xff;
 					fontaddr[(ch * lcg_font.stride * lcg_font.fontheight) + line + 1] = (temp >> 16) & 0xff;
+				}
+			}
 #endif
 		lutaddr = (void *)vax_map_physmem(LCG_LUT_ADDR, (LCG_LUT_SIZE/VAX_NBPG));
 		if (lutaddr == 0) {
-			printf("%s: unable to allocate LUT memory.\n", self->dv_xname);
+			device_printf(self,
 			    "unable to allocate LUT memory.\n");
 			return;
+		}
 		fifoaddr = (long*)vax_map_physmem(LCG_FIFO_WIN_ADDR, (LCG_FIFO_WIN_SIZE/VAX_NBPG));
 		if (regaddr == 0) {
-			printf("%s: unable to map FIFO window\n", self->dv_xname);
+			device_printf(self, "unable to map FIFO window\n");
 			return;
+		}
 		/* allocate contiguous physical memory block for FIFO */
 		err = bus_dmamem_alloc(va->va_dmat, LCG_FIFO_SIZE,
 			LCG_FIFO_ALIGN, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT);
 		if (err) {
-			printf("%s: unable to allocate FIFO memory block, err = %d\n",
+			device_printf(self,
-				self->dv_xname, err);
+			    "unable to allocate FIFO memory block, err = %d\n",
 			    err);
 			return;
+		}
 		err = bus_dmamem_map(va->va_dmat, &seg, rseg, LCG_FIFO_SIZE,
 			&fifo_mem_vaddr, BUS_DMA_NOWAIT);
 		if (err) {
-			printf("%s: unable to map FIFO memory block, err = %d\n",
+			device_printf(self,
-				self->dv_xname, err);
+			    "unable to map FIFO memory block, err = %d\n",
 			    err);
 			bus_dmamem_free(va->va_dmat, &seg, rseg);
 			return;
+		}
 		err = bus_dmamap_create(va->va_dmat, LCG_FIFO_SIZE, rseg,
 			LCG_FIFO_SIZE, 0, BUS_DMA_NOWAIT, &sc->sc_dm);
 		if (err) {
-			printf("%s: unable to create DMA map, err = %d\n", self->dv_xname, err);
+			device_printf(self,
 			    "unable to create DMA map, err = %d\n",
 			    err);
 			bus_dmamem_unmap(va->va_dmat, fifo_mem_vaddr, LCG_FIFO_SIZE);
 			bus_dmamem_free(va->va_dmat, &seg, rseg);
 			return;
+		}
 		err = bus_dmamap_load(va->va_dmat, sc->sc_dm, fifo_mem_vaddr,
 			LCG_FIFO_SIZE, NULL, BUS_DMA_NOWAIT);
 		if (err) {
-			printf("%s: unable to load DMA map, err = %d\n", self->dv_xname, err);
+			device_printf(self,
 			    "unable to load DMA map, err = %d\n",
 			    err);
 			bus_dmamap_destroy(va->va_dmat, sc->sc_dm);
 			bus_dmamem_unmap(va->va_dmat, fifo_mem_vaddr, LCG_FIFO_SIZE);
 			bus_dmamem_free(va->va_dmat, &seg, rseg);
 			return;
+		}
 		/* initialize LCG hardware */
 		LCG_REG(LCG_REG_GRAPHICS_CONTROL) = 0xd8000000; /* gfx reset, FIFO and AG enable */
 //		LCG_REG(LCG_REG_WRITE_PROTECT_LOW_HIGH) = (((LCG_FB_ADDR + lcg_fb_size) & 0xffff0000) | (LCG_FB_ADDR >> 16));
 		LCG_REG(LCG_REG_WRITE_PROTECT_LOW_HIGH) = 0xffff0000;
 		LCG_REG(LCG_REG_FIFO_BASE) = sc->sc_dm->dm_segs[0].ds_addr;
 		LCG_REG(LCG_REG_FIFO_BASE2) = sc->sc_dm->dm_segs[0].ds_addr;
 		LCG_REG(LCG_REG_FIFO_MASKS) = 0xffff;
 @@ -1278,16 +1289,17 @@ lcg_init_common(struct device *self, str
 		video_conf |= (1 << 5); /* split shift register load */
+	}
 	LCG_REG(LCG_REG_VIDEO_CONFIG) = video_conf;
 	/* vital !!! */
 	LCG_REG(LCG_REG_LUT_CONSOLE_SEL) = 1;
 	LCG_REG(LCG_REG_LUT_COLOR_BASE_W) = LCG_LUT_OFFSET;
 	delay(1000);
 	LCG_REG(LCG_REG_LUT_CONSOLE_SEL) = 0;
 #ifdef LCG_DEBUG
 	if (self != NULL)
-		printf("%s: video config register set 0x%08lx\n", video_conf, self->dv_xname);
+		device_printf(self, "video config register set 0x%08lx\n",
 		    video_conf);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_autoconf.c,v 1.85 2021/10/07 12:52:27 msaitoh Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.86 2022/02/12 03:24:35 riastradh Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * 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.
 @@ -25,27 +25,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.
+ *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.85 2021/10/07 12:52:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.86 2022/02/12 03:24:35 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
 #include <sys/md5.h>
 #include <sys/kauth.h>
 @@ -558,27 +558,27 @@ cpu_rootconf(void)
+}
 void
 device_register(device_t dev, void *aux)
+{
 	device_t isaboot, pciboot;
 	/*
 	 * The Intel Integrated Memory Controller has a built-in i2c
 	 * controller that's rather limited in capability; it is intended
 	 * only for reading memory module EERPOMs and sensors.
 	 */
 	if (device_is_a(dev, "iic") &&
-	    device_is_a(dev->dv_parent, "imcsmb")) {
+	    device_is_a(device_parent(dev), "imcsmb")) {
 		static const char *imcsmb_device_permitlist[] = {
 			"spdmem",
 			"sdtemp",
 			NULL,
 		};
 		prop_array_t permitlist = prop_array_create();
 		prop_dictionary_t props = device_properties(dev);
 		int i;
 		for (i = 0; imcsmb_device_permitlist[i] != NULL; i++) {
 			prop_string_t pstr = prop_string_create_nocopy(
 			    imcsmb_device_permitlist[i]);
 			(void) prop_array_add(permitlist, pstr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.14 2021/06/21 03:05:24 christos Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.15 2022/02/12 03:24:35 riastradh Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2021/06/21 03:05:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2022/02/12 03:24:35 riastradh Exp $");
 #include "opt_md.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 #include <sys/disk.h>
 @@ -216,18 +216,18 @@ cpu_rootconf(void)
 	    booted_device ? device_xname(booted_device) : "<unknown>");
 	rootconf();
+}
 void
 device_register(device_t dev, void *aux)
+{
 	/*
 	 * I2C bus conntected to pxaiic(4) for zaudio(4) devices has
 	 * limited capabilities.
 	 */
 	if (device_is_a(dev, "iic") &&
-	    device_is_a(dev->dv_parent, "ziic")) {
+	    device_is_a(device_parent(dev), "ziic")) {
 		(void)prop_dictionary_set_string_nocopy(device_properties(dev),
 		    I2C_PROP_INDIRECT_PROBE_STRATEGY, I2C_PROBE_STRATEGY_NONE);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spkr.c,v 1.21 2021/08/07 16:19:08 thorpej Exp $	*/
+/*	$NetBSD: spkr.c,v 1.22 2022/02/12 03:24:36 riastradh Exp $	*/
 /*
  * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
  * Copyright (c) 1990 Andrew A. Chernov (ache@astral.msk.su)
  * Copyright (c) 1990 Lennart Augustsson (lennart@augustsson.net)
  * 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
 @@ -33,27 +33,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * spkr.c -- device driver for console speaker on 80386
+ *
  * v1.1 by Eric S. Raymond (esr@snark.thyrsus.com) Feb 1990
  *      modified for 386bsd by Andrew A. Chernov <ache@astral.msk.su>
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.21 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.22 2022/02/12 03:24:36 riastradh Exp $");
 #if defined(_KERNEL_OPT)
 #include "wsmux.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/uio.h>
 @@ -406,44 +406,46 @@ playstring(struct spkr_softc *sc, const
  *	to finish playing the beep and then halts it.
  *	If the pitch is zero, it halts all sound if any (for compatibility
  *	with the past confused specifications, but there should be no sound at
  *	this point).  And it returns immediately, without waiting ticks.  So
  *	you cannot use this as a rest.
  *	If the tick is zero, it returns immediately.
  */
 void
 spkr_attach(device_t self, void (*tone)(device_t, u_int, u_int))
+{
 	struct spkr_softc *sc = device_private(self);
 #ifdef SPKRDEBUG
-	aprint_debug("%s: entering for unit %d\n", __func__, self->dv_unit);
+	aprint_debug("%s: entering for unit %d\n", __func__,
 	    device_unit(self));
 #endif /* SPKRDEBUG */
 	sc->sc_dev = self;
 	sc->sc_tone = tone;
 	sc->sc_inbuf = NULL;
 	sc->sc_wsbelldev = NULL;
 	spkr_rescan(self, NULL, NULL);
+}
 int
 spkr_detach(device_t self, int flags)
+{
 	struct spkr_softc *sc = device_private(self);
 	int rc;
 #ifdef SPKRDEBUG
-	aprint_debug("%s: entering for unit %d\n", __func__, self->dv_unit);
+	aprint_debug("%s: entering for unit %d\n", __func__,
 	    device_unit(self));
 #endif /* SPKRDEBUG */
 	if (sc == NULL)
 		return ENXIO;
 	/* XXXNS If speaker never closes, we cannot complete the detach. */
 	while ((flags & DETACH_FORCE) != 0 && sc->sc_inbuf != NULL)
 		kpause("spkrwait", TRUE, 1, NULL);
 	if (sc->sc_inbuf != NULL)
 		return EBUSY;
 	rc = config_detach_children(self, flags);
 	return rc;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ihidev.c,v 1.27 2022/01/15 06:22:30 skrll Exp $ */
+/* $NetBSD: ihidev.c,v 1.28 2022/02/12 03:24:35 riastradh Exp $ */
 /* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt Exp $ */
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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
 @@ -44,27 +44,27 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * HID-over-i2c driver
+ *
  * https://msdn.microsoft.com/en-us/library/windows/hardware/dn642101%28v=vs.85%29.aspx
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.27 2022/01/15 06:22:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.28 2022/02/12 03:24:35 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/workqueue.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/ihidev.h>
 #include <dev/hid/hid.h>
 #if defined(__i386__) || defined(__amd64__)
 @@ -194,28 +194,28 @@ ihidev_attach(device_t parent, device_t
 	    KM_SLEEP);
 	/* find largest report size and allocate memory for input buffer */
 	sc->sc_isize = le16toh(sc->hid_desc.wMaxInputLength);
 	for (repid = 0; repid < sc->sc_nrepid; repid++) {
 		repsz = hid_report_size(sc->sc_report, sc->sc_reportlen,
 		    hid_input, repid);
 		isize = repsz + 2; /* two bytes for the length */
 		isize += (sc->sc_nrepid != 1); /* one byte for the report ID */
 		if (isize > sc->sc_isize)
 			sc->sc_isize = isize;
-		DPRINTF(("%s: repid %d size %d\n", sc->sc_dev.dv_xname, repid,
+		DPRINTF(("%s: repid %d size %d\n",
-		    repsz));
+		    device_xname(sc->sc_dev), repid, repsz));
+	}
 	sc->sc_ibuf = kmem_zalloc(sc->sc_isize, KM_SLEEP);
 	if (!ihidev_intr_init(sc)) {
 		return;
+	}
 	iha.iaa = ia;
 	iha.parent = sc;
 	/* Look for a driver claiming all report IDs first. */
 	iha.reportid = IHIDEV_CLAIM_ALLREPORTID;
 	locs[IHIDBUSCF_REPORTID] = IHIDEV_CLAIM_ALLREPORTID;
 	dev = config_found(self, &iha, ihidev_print,
 @@ -324,50 +324,50 @@ ihidev_hid_command(struct ihidev_softc *
 	switch (hidcmd) {
 	case I2C_HID_CMD_DESCR: {
 		/*
 		 * 5.2.2 - HID Descriptor Retrieval
 		 * register is passed from the controller
 		 */
 		uint8_t cmd[] = {
 			htole16(sc->sc_hid_desc_addr) & 0xff,
 			htole16(sc->sc_hid_desc_addr) >> 8,
 		};
 		DPRINTF(("%s: HID command I2C_HID_CMD_DESCR at 0x%x\n",
-		    sc->sc_dev.dv_xname, htole16(sc->sc_hid_desc_addr)));
+		    device_xname(sc->sc_dev), htole16(sc->sc_hid_desc_addr)));
 		/* 20 00 */
 		res = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr,
 		    &cmd, sizeof(cmd), &sc->hid_desc_buf,
 		    sizeof(struct i2c_hid_desc), flags);
-		DPRINTF(("%s: HID descriptor:", sc->sc_dev.dv_xname));
+		DPRINTF(("%s: HID descriptor:", device_xname(sc->sc_dev)));
 		for (i = 0; i < sizeof(struct i2c_hid_desc); i++)
 			DPRINTF((" %.2x", sc->hid_desc_buf[i]));
 		DPRINTF(("\n"));
 		break;
+	}
 	case I2C_HID_CMD_RESET: {
 		uint8_t cmd[] = {
 			htole16(sc->hid_desc.wCommandRegister) & 0xff,
 			htole16(sc->hid_desc.wCommandRegister) >> 8,
 ,
 			I2C_HID_CMD_RESET,
 		};
 		DPRINTF(("%s: HID command I2C_HID_CMD_RESET\n",
-		    sc->sc_dev.dv_xname));
+		    device_xname(sc->sc_dev)));
 		/* 22 00 00 01 */
 		res = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_addr,
 		    &cmd, sizeof(cmd), NULL, 0, flags);
 		break;
+	}
 	case I2C_HID_CMD_GET_REPORT: {
 		struct i2c_hid_report_request *rreq =
 		    (struct i2c_hid_report_request *)arg;
 		uint8_t cmd[] = {
 			htole16(sc->hid_desc.wCommandRegister) & 0xff,
 @@ -375,27 +375,27 @@ ihidev_hid_command(struct ihidev_softc *
 ,
 			I2C_HID_CMD_GET_REPORT,
 , 0, 0,
 		};
 		int cmdlen = 7;
 		int dataoff = 4;
 		int report_id = rreq->id;
 		int report_id_len = 1;
 		int report_len = rreq->len + 2;
 		int d;
 		uint8_t *tmprep;
 		DPRINTF(("%s: HID command I2C_HID_CMD_GET_REPORT %d "
-		    "(type %d, len %d)\n", sc->sc_dev.dv_xname, report_id,
+		    "(type %d, len %d)\n", device_xname(sc->sc_dev), report_id,
 		    rreq->type, rreq->len));
 		/*
 		 * 7.2.2.4 - "The protocol is optimized for Report < 15.  If a
 		 * report ID >= 15 is necessary, then the Report ID in the Low
 		 * Byte must be set to 1111 and a Third Byte is appended to the
 		 * protocol.  This Third Byte contains the entire/actual report
 		 * ID."
 		 */
 		if (report_id >= 15) {
 			cmd[dataoff++] = report_id;
 			report_id = 15;
 			report_id_len = 2;
 @@ -421,43 +421,43 @@ ihidev_hid_command(struct ihidev_softc *
 			DPRINTF(("%s: out of memory\n",
 				device_xname(sc->sc_dev)));
 			res = ENOMEM;
 			break;
+		}
 		/* type 3 id 8: 22 00 38 02 23 00 */
 		res = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr,
 		    &cmd, cmdlen, tmprep, report_len, flags);
 		d = tmprep[0] | tmprep[1] << 8;
 		if (d != report_len) {
 			DPRINTF(("%s: response size %d != expected length %d\n",
-			    sc->sc_dev.dv_xname, d, report_len));
+			    device_xname(sc->sc_dev), d, report_len));
+		}
 		if (report_id_len == 2)
 			d = tmprep[2] | tmprep[3] << 8;
 		else
 			d = tmprep[2];
 		if (d != rreq->id) {
 			DPRINTF(("%s: response report id %d != %d\n",
-			    sc->sc_dev.dv_xname, d, rreq->id));
+			    device_xname(sc->sc_dev), d, rreq->id));
 			iic_release_bus(sc->sc_tag, 0);
 			kmem_free(tmprep, report_len);
 			return (1);
+		}
-		DPRINTF(("%s: response:", sc->sc_dev.dv_xname));
+		DPRINTF(("%s: response:", device_xname(sc->sc_dev)));
 		for (i = 0; i < report_len; i++)
 			DPRINTF((" %.2x", tmprep[i]));
 		DPRINTF(("\n"));
 		memcpy(rreq->data, tmprep + 2 + report_id_len, rreq->len);
 		kmem_free(tmprep, report_len);
 		break;
+	}
 	case I2C_HID_CMD_SET_REPORT: {
 		struct i2c_hid_report_request *rreq =
 		    (struct i2c_hid_report_request *)arg;
 @@ -465,27 +465,27 @@ ihidev_hid_command(struct ihidev_softc *
 			htole16(sc->hid_desc.wCommandRegister) & 0xff,
 			htole16(sc->hid_desc.wCommandRegister) >> 8,
 ,
 			I2C_HID_CMD_SET_REPORT,
 , 0, 0, 0, 0, 0,
 		};
 		int cmdlen = 10;
 		int report_id = rreq->id;
 		int report_len = 2 + (report_id ? 1 : 0) + rreq->len;
 		int dataoff;
 		uint8_t *finalcmd;
 		DPRINTF(("%s: HID command I2C_HID_CMD_SET_REPORT %d "
-		    "(type %d, len %d):", sc->sc_dev.dv_xname, report_id,
+		    "(type %d, len %d):", device_xname(sc->sc_dev), report_id,
 		    rreq->type, rreq->len));
 		for (i = 0; i < rreq->len; i++)
 			DPRINTF((" %.2x", ((uint8_t *)rreq->data)[i]));
 		DPRINTF(("\n"));
 		/*
 		 * 7.2.2.4 - "The protocol is optimized for Report < 15.  If a
 		 * report ID >= 15 is necessary, then the Report ID in the Low
 		 * Byte must be set to 1111 and a Third Byte is appended to the
 		 * protocol.  This Third Byte contains the entire/actual report
 		 * ID."
 		 */
 		dataoff = 4;
 @@ -530,69 +530,70 @@ ihidev_hid_command(struct ihidev_softc *
  		break;
+ 	}
 	case I2C_HID_CMD_SET_POWER: {
 		int power = *(int *)arg;
 		uint8_t cmd[] = {
 			htole16(sc->hid_desc.wCommandRegister) & 0xff,
 			htole16(sc->hid_desc.wCommandRegister) >> 8,
 			power,
 			I2C_HID_CMD_SET_POWER,
 		};
 		DPRINTF(("%s: HID command I2C_HID_CMD_SET_POWER(%d)\n",
-		    sc->sc_dev.dv_xname, power));
+		    device_xname(sc->sc_dev), power));
 		/* 22 00 00 08 */
 		res = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_addr,
 		    &cmd, sizeof(cmd), NULL, 0, flags);
 		break;
+	}
 	case I2C_HID_REPORT_DESCR: {
 		uint8_t cmd[] = {
 			htole16(sc->hid_desc.wReportDescRegister) & 0xff,
 			htole16(sc->hid_desc.wReportDescRegister) >> 8,
 		};
 		DPRINTF(("%s: HID command I2C_HID_REPORT_DESCR at 0x%x with "
-		    "size %d\n", sc->sc_dev.dv_xname, cmd[0],
+		    "size %d\n", device_xname(sc->sc_dev), cmd[0],
 		    sc->sc_reportlen));
 		/* 20 00 */
 		res = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr,
 		    &cmd, sizeof(cmd), sc->sc_report, sc->sc_reportlen, flags);
-		DPRINTF(("%s: HID report descriptor:", sc->sc_dev.dv_xname));
+		DPRINTF(("%s: HID report descriptor:",
 		    device_xname(sc->sc_dev)));
 		for (i = 0; i < sc->sc_reportlen; i++)
 			DPRINTF((" %.2x", sc->sc_report[i]));
 		DPRINTF(("\n"));
 		break;
+	}
 	default:
 		aprint_error_dev(sc->sc_dev, "unknown command %d\n",
 		    hidcmd);
+	}
 	iic_release_bus(sc->sc_tag, flags);
 	return (res);
+}
 static int
 ihidev_reset(struct ihidev_softc *sc, bool poll)
+{
-	DPRINTF(("%s: resetting\n", sc->sc_dev.dv_xname));
+	DPRINTF(("%s: resetting\n", device_xname(sc->sc_dev)));
 	if (ihidev_hid_command(sc, I2C_HID_CMD_SET_POWER,
 	    &I2C_HID_POWER_ON, poll)) {
 		aprint_error_dev(sc->sc_dev, "failed to power on\n");
 		return (1);
+	}
 	DELAY(1000);
 	if (ihidev_hid_command(sc, I2C_HID_CMD_RESET, 0, poll)) {
 		aprint_error_dev(sc->sc_dev, "failed to reset hardware\n");
 		ihidev_hid_command(sc, I2C_HID_CMD_SET_POWER,
 @@ -785,43 +786,43 @@ ihidev_work(struct work *wk, void *arg)
 	res = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_addr, NULL, 0,
 	    sc->sc_ibuf, sc->sc_isize, 0);
 	iic_release_bus(sc->sc_tag, 0);
 	if (res != 0)
 		goto out;
 	/*
 	 * 6.1.1 - First two bytes are the packet length, which must be less
 	 * than or equal to wMaxInputLength
 	 */
 	psize = sc->sc_ibuf[0] | sc->sc_ibuf[1] << 8;
 	if (!psize || psize > sc->sc_isize) {
 		DPRINTF(("%s: %s: invalid packet size (%d vs. %d)\n",
-		    sc->sc_dev.dv_xname, __func__, psize, sc->sc_isize));
+		    device_xname(sc->sc_dev), __func__, psize, sc->sc_isize));
 		goto out;
+	}
 	/* 3rd byte is the report id */
 	p = sc->sc_ibuf + 2;
 	psize -= 2;
 	if (sc->sc_nrepid != 1)
 		rep = *p++, psize--;
 	if (rep >= sc->sc_nrepid) {
 		aprint_error_dev(sc->sc_dev, "%s: bad report id %d\n",
 		    __func__, rep);
 		goto out;
+	}
-	DPRINTF(("%s: %s: hid input (rep %d):", sc->sc_dev.dv_xname,
+	DPRINTF(("%s: %s: hid input (rep %d):", device_xname(sc->sc_dev),
 	    __func__, rep));
 	for (i = 0; i < sc->sc_isize; i++)
 		DPRINTF((" %.2x", sc->sc_ibuf[i]));
 	DPRINTF(("\n"));
 	scd = sc->sc_subdevs[rep];
 	if (scd == NULL || !(scd->sc_state & IHIDEV_OPEN))
 		goto out;
 	scd->sc_intr(scd, p, psize);
  out:
 	mutex_exit(&sc->sc_lock);
 @@ -874,27 +875,27 @@ ihidev_submatch(device_t parent, cfdata_
 	if (cf->ihidevcf_reportid != IHIDEV_UNK_REPORTID &&
 	    cf->ihidevcf_reportid != iha->reportid)
 		return (0);
 	return config_match(parent, cf, aux);
+}
 int
 ihidev_open(struct ihidev *scd)
+{
 	struct ihidev_softc *sc = scd->sc_parent;
 	int error;
-	DPRINTF(("%s: %s: state=%d refcnt=%d\n", sc->sc_dev.dv_xname,
+	DPRINTF(("%s: %s: state=%d refcnt=%d\n", device_xname(sc->sc_dev),
 	    __func__, scd->sc_state, sc->sc_refcnt));
 	mutex_enter(&sc->sc_lock);
 	if (scd->sc_state & IHIDEV_OPEN || sc->sc_refcnt == INT_MAX) {
 		error = EBUSY;
 		goto out;
+	}
 	scd->sc_state |= IHIDEV_OPEN;
 	if (sc->sc_refcnt++ || sc->sc_isize == 0) {
 		error = 0;
 @@ -904,27 +905,27 @@ ihidev_open(struct ihidev *scd)
 	/* power on */
 	ihidev_reset(sc, false);
 	error = 0;
 out:	mutex_exit(&sc->sc_lock);
 	return error;
+}
 void
 ihidev_close(struct ihidev *scd)
+{
 	struct ihidev_softc *sc = scd->sc_parent;
-	DPRINTF(("%s: %s: state=%d refcnt=%d\n", sc->sc_dev.dv_xname,
+	DPRINTF(("%s: %s: state=%d refcnt=%d\n", device_xname(sc->sc_dev),
 	    __func__, scd->sc_state, sc->sc_refcnt));
 	mutex_enter(&sc->sc_lock);
 	KASSERTMSG(scd->sc_state & IHIDEV_OPEN,
 	    "%s: closing %s when not open",
 	    device_xname(scd->sc_idev),
 	    device_xname(sc->sc_dev));
 	scd->sc_state &= ~IHIDEV_OPEN;
 	if (--sc->sc_refcnt)
 		goto out;

 @@ -1,14 +1,14 @@
-/* $NetBSD: pcagpio.c,v 1.11 2021/06/21 03:12:54 christos Exp $ */
+/* $NetBSD: pcagpio.c,v 1.12 2022/02/12 03:24:35 riastradh Exp $ */
 /*-
  * Copyright (c) 2020 Michael Lorenz
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * a driver for Philips Semiconductor PCA9555 GPIO controllers
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.11 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcagpio.c,v 1.12 2022/02/12 03:24:35 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #ifdef PCAGPIO_DEBUG
 #include <sys/kernel.h>
 #endif
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/led.h>
 @@ -162,29 +162,29 @@ pcagpio_attach(device_t parent, device_t
 	aprint_normal(": %s\n", sc->sc_is_16bit ? "PCA9555" : "PCA9556");
 	sc->sc_state = pcagpio_readreg(sc, PCAGPIO_OUTPUT);
 #ifdef PCAGPIO_DEBUG
 	uint32_t in, out;
 	sc->sc_dir = pcagpio_readreg(sc, PCAGPIO_CONFIG);
 	sc->sc_in = pcagpio_readreg(sc, PCAGPIO_INPUT);
 	in = sc-> sc_in;
 	out = sc->sc_state;
 	out &= ~sc->sc_dir;
 	in &= sc->sc_dir;
-	printdir(sc->sc_dev->dv_xname, in, sc->sc_dir, 'I');
+	printdir(device_xname(sc->sc_dev), in, sc->sc_dir, 'I');
-	printdir(sc->sc_dev->dv_xname, out, ~sc->sc_dir, 'O');
+	printdir(device_xname(sc->sc_dev), out, ~sc->sc_dir, 'O');
 	callout_init(&sc->sc_timer, CALLOUT_MPSAFE);
 	callout_reset(&sc->sc_timer, hz*20, pcagpio_timeout, sc);
 #endif
 	pins = prop_dictionary_get(dict, "pins");
 	if (pins != NULL) {
 		int i, num, def;
 		char name[32];
 		const char *spptr, *nptr;
 		bool ok = TRUE, act;
 @@ -236,35 +236,35 @@ pcagpio_timeout(void *v)
+{
 	struct pcagpio_softc *sc = v;
 	uint32_t out, dir, in, o_out, o_in;
 	out = pcagpio_readreg(sc, PCAGPIO_OUTPUT);
 	dir = pcagpio_readreg(sc, PCAGPIO_CONFIG);
 	in = pcagpio_readreg(sc, PCAGPIO_INPUT);
 	if (out != sc->sc_state || dir != sc->sc_dir || in != sc->sc_in) {
 		aprint_normal_dev(sc->sc_dev, "status change\n");
 		o_out = sc->sc_state;
 		o_in = sc->sc_in;
 		o_out &= ~sc->sc_dir;
 		o_in &= sc->sc_dir;
-		printdir(sc->sc_dev->dv_xname, o_in, sc->sc_dir, 'I');
+		printdir(device_xname(sc->sc_dev), o_in, sc->sc_dir, 'I');
-		printdir(sc->sc_dev->dv_xname, o_out, ~sc->sc_dir, 'O');
+		printdir(device_xname(sc->sc_dev), o_out, ~sc->sc_dir, 'O');
 		sc->sc_state = out;
 		sc->sc_dir = dir;
 		sc->sc_in = in;
 		out &= ~sc->sc_dir;
 		in &= sc->sc_dir;
-		printdir(sc->sc_dev->dv_xname, in, sc->sc_dir, 'I');
+		printdir(device_xname(sc->sc_dev), in, sc->sc_dir, 'I');
-		printdir(sc->sc_dev->dv_xname, out, ~sc->sc_dir, 'O');
+		printdir(device_xname(sc->sc_dev), out, ~sc->sc_dir, 'O');
+	}
 	callout_reset(&sc->sc_timer, hz*60, pcagpio_timeout, sc);
+}
 #endif
 static void
 pcagpio_writereg(struct pcagpio_softc *sc, int reg, uint32_t val)
+{
 	uint8_t cmd;
 	iic_acquire_bus(sc->sc_i2c, 0);
 	if (sc->sc_is_16bit) {
 		uint16_t creg;

 @@ -1,14 +1,14 @@
-/* $NetBSD: tsllux.c,v 1.3 2021/01/27 02:29:48 thorpej Exp $ */
+/* $NetBSD: tsllux.c,v 1.4 2022/02/12 03:24:35 riastradh Exp $ */
 /*-
  * Copyright (c) 2018 Jason R. Thorpe
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsllux.c,v 1.3 2021/01/27 02:29:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsllux.c,v 1.4 2022/02/12 03:24:35 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <dev/i2c/i2cvar.h>
 @@ -144,28 +144,27 @@ static void
 tsllux_attach(device_t parent, device_t self, void *aux)
+{
 	struct tsllux_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 	bool have_i2c;
 	/* XXX IPL_NONE changes when we support threshold interrupts. */
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	sc->sc_dev = self;
 	sc->sc_i2c = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
-	if (self->dv_cfdata != NULL &&
+	if (device_cfdata(self)->cf_flags & TSLLUX_F_CS_PACKAGE)
 	    self->dv_cfdata->cf_flags & TSLLUX_F_CS_PACKAGE)
 		sc->sc_cs_package = true;
 	if (iic_acquire_bus(ia->ia_tag, 0) != 0) {
 		return;
+	}
 	have_i2c = true;
 	/* Power on the device and clear any pending interrupts. */
 	if (tsllux_write1(sc, TSL256x_REG_CONTROL | COMMAND6x_CLEAR,
 			  CONTROL6x_POWER_ON)) {
 		aprint_error_dev(self, ": unable to power on device\n");
 		goto out;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wss_isa.c,v 1.30 2019/05/08 13:40:18 isaki Exp $	*/
+/*	$NetBSD: wss_isa.c,v 1.31 2022/02/12 03:24:35 riastradh Exp $	*/
 /*
  * Copyright (c) 1994 John Brezak
  * Copyright (c) 1991-1993 Regents of the University of California.
  * All rights reserved.
+ *
  * MAD support:
  * Copyright (c) 1996 Lennart Augustsson
  * Based on code which is
  * Copyright (c) 1994 Hannu Savolainen
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -31,27 +31,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.30 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.31 2022/02/12 03:24:35 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -61,91 +61,85 @@ __KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v
 #include <dev/ic/ad1848reg.h>
 #include <dev/isa/ad1848var.h>
 #include <dev/isa/wssreg.h>
 #include <dev/isa/wssvar.h>
 #include <dev/isa/madreg.h>
 #ifdef AUDIO_DEBUG
 #define DPRINTF(x)	if (wssdebug) printf x
 extern int	wssdebug;
 #else
 #define DPRINTF(x)
 #endif
-static int	wssfind(device_t, struct wss_softc *, int,
+static int	wssfind(device_t, cfdata_t, struct wss_softc *, int,
 		    struct isa_attach_args *);
 static void	madprobe(struct wss_softc *, int);
 static void	madunmap(struct wss_softc *);
 static int	detect_mad16(struct wss_softc *, int);
 int		wss_isa_probe(device_t, cfdata_t, void *);
 void		wss_isa_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(wss_isa, sizeof(struct wss_softc),
     wss_isa_probe, wss_isa_attach, NULL, NULL);
 /*
  * Probe for the Microsoft Sound System hardware.
  */
 int
 wss_isa_probe(device_t parent, cfdata_t match, void *aux)
+{
 	struct isa_attach_args *ia;
 	struct device probedev;
 	struct wss_softc probesc, *sc;
 	struct ad1848_softc *ac;
 	ia = aux;
 	if (ia->ia_nio < 1)
 		return 0;
 	if (ia->ia_nirq < 1)
 		return 0;
 	if (ia->ia_ndrq < 1)
 		return 0;
 	if (ISA_DIRECT_CONFIG(ia))
 		return 0;
 	memset(&probedev, 0, sizeof probedev);
 	memset(&probesc, 0, sizeof probesc);
 	sc = &probesc;
-	ac = &sc->sc_ad1848.sc_ad1848;
+	if (wssfind(parent, match, sc, 1, aux)) {
 	ac->sc_dev = &probedev;
 	ac->sc_dev->dv_cfdata = match;
 	if (wssfind(parent, sc, 1, aux)) {
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, WSS_CODEC);
 		ad1848_isa_unmap(&sc->sc_ad1848);
 		madunmap(sc);
 		return 1;
 	} else
 		/* Everything is already unmapped */
 		return 0;
+}
 static int
-wssfind(device_t parent, struct wss_softc *sc, int probing,
+wssfind(device_t parent, cfdata_t match, struct wss_softc *sc, int probing,
     struct isa_attach_args *ia)
+{
 	static u_char interrupt_bits[12] = {
 		-1, -1, -1, -1, -1, -1, -1, 0x08, -1, 0x10, 0x18, 0x20
 	};
 	static u_char dma_bits[4] = {1, 2, 0, 3};
 	struct ad1848_softc *ac;
 	int ndrq, playdrq, recdrq;
 	ac = &sc->sc_ad1848.sc_ad1848;
 	sc->sc_iot = ia->ia_iot;
-	if (device_cfdata(ac->sc_dev)->cf_flags & 1)
+	if (match->cf_flags & 1)
 		madprobe(sc, ia->ia_io[0].ir_addr);
 	else
 		sc->mad_chip_type = MAD_NONE;
 #if 0
 	if (!WSS_BASE_VALID(ia->ia_io[0].ir_addr)) {
 		DPRINTF(("wss: configured iobase %x invalid\n", ia->ia_iobase));
 		goto bad1;
+	}
 #endif
 	/* Map the ports upto the AD1848 port */
 	if (bus_space_map(sc->sc_iot, ia->ia_io[0].ir_addr, WSS_CODEC,
 @@ -235,27 +229,27 @@ bad1:
  * pseudo-device driver .
  */
 void
 wss_isa_attach(device_t parent, device_t self, void *aux)
+{
 	struct wss_softc *sc;
 	struct ad1848_softc *ac;
 	struct isa_attach_args *ia;
 	sc = device_private(self);
 	ac = &sc->sc_ad1848.sc_ad1848;
 	ac->sc_dev = self;
 	ia = aux;
-	if (!wssfind(parent, sc, 0, ia)) {
+	if (!wssfind(parent, device_cfdata(self), sc, 0, ia)) {
 		aprint_error_dev(self, "wssfind failed\n");
 		return;
+	}
 	sc->wss_ic = ia->ia_ic;
 	wssattach(sc);
+}
 /*
  * Copyright by Hannu Savolainen 1994
+ *
  * Redistribution and use in source and binary forms, with or without

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_mvxpe.c,v 1.37 2021/12/05 07:57:38 msaitoh Exp $	*/
+/*	$NetBSD: if_mvxpe.c,v 1.38 2022/02/12 03:24:35 riastradh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * 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.
+ *
  * 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: if_mvxpe.c,v 1.37 2021/12/05 07:57:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.38 2022/02/12 03:24:35 riastradh Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/evcnt.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 @@ -472,27 +472,28 @@ mvxpe_attach(device_t parent, device_t s
+	}
 	mii->mii_ifp = ifp;
 	mii->mii_readreg = mvxpe_miibus_readreg;
 	mii->mii_writereg = mvxpe_miibus_writereg;
 	mii->mii_statchg = mvxpe_miibus_statchg;
 	sc->sc_ethercom.ec_mii = mii;
 	ifmedia_init(&mii->mii_media, 0, mvxpe_mediachange, mvxpe_mediastatus);
 	/*
 	 * XXX: phy addressing highly depends on Board Design.
 	 * we assume phyaddress == MAC unit number here,
 	 * but some boards may not.
 	 */
-	mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, sc->sc_dev->dv_unit, 0);
+	mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, device_unit(sc->sc_dev),
 );
 	child = LIST_FIRST(&mii->mii_phys);
 	if (child == NULL) {
 		aprint_error_dev(self, "no PHY found!\n");
 		ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
 	} else {
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
 		phyaddr = MVXPE_PHYADDR_PHYAD(child->mii_phy);
 		MVXPE_WRITE(sc, MVXPE_PHYADDR, phyaddr);
 		DPRINTSC(sc, 1, "PHYADDR: %#x\n", MVXPE_READ(sc, MVXPE_PHYADDR));
+	}
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xmm7360.c,v 1.13 2021/10/18 08:15:00 hannken Exp $	*/
+/*	$NetBSD: xmm7360.c,v 1.14 2022/02/12 03:24:36 riastradh Exp $	*/
 /*
  * Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
  * Written by James Wah
  * james@laird-wah.net
+ *
  * Development of this driver was supported by genua GmbH
+ *
  * Copyright (c) 2020 genua GmbH <info@genua.de>
  * Copyright (c) 2020 James Wah <james@laird-wah.net>
+ *
  * The OpenBSD and NetBSD support was written by Jaromir Dolecek for
  * Moritz Systems Technology Company Sp. z o.o.
 @@ -65,27 +65,27 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
 #endif
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #ifdef __OpenBSD__
 #include "bpfilter.h"
 #endif
 #ifdef __NetBSD__
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.13 2021/10/18 08:15:00 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.14 2022/02/12 03:24:36 riastradh Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mutex.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/kthread.h>
 @@ -133,29 +133,29 @@ typedef uint32_t u32;
 typedef bus_addr_t dma_addr_t;
 typedef void * wait_queue_head_t;	/* just address for tsleep() */
 #define WWAN_BAR0	PCI_MAPREG_START
 #define WWAN_BAR1	(PCI_MAPREG_START + 4)
 #define WWAN_BAR2	(PCI_MAPREG_START + 8)
 #define BUG_ON(never_true)	KASSERT(!(never_true))
 #define WARN_ON(x)		/* nothing */
 #ifdef __OpenBSD__
 typedef struct mutex spinlock_t;
 #define dev_err(devp, fmt, ...)		\
-	printf("%s: " fmt, (devp)->dv_xname, ##__VA_ARGS__)
+	printf("%s: " fmt, device_xname(devp), ##__VA_ARGS__)
 #define dev_info(devp, fmt, ...)	\
-	printf("%s: " fmt, (devp)->dv_xname, ##__VA_ARGS__)
+	printf("%s: " fmt, device_xname(devp), ##__VA_ARGS__)
 #define	kzalloc(size, flags)	malloc(size, M_DEVBUF, M_WAITOK | M_ZERO)
 #define kfree(addr)		free(addr, M_DEVBUF, 0)
 #define mutex_init(lock)	mtx_init(lock, IPL_TTY)
 #define mutex_lock(lock)	mtx_enter(lock)
 #define mutex_unlock(lock)	mtx_leave(lock)
 /* In OpenBSD every mutex is spin mutex, and it must not be held on sleep */
 #define spin_lock_irqsave(lock, flags)		mtx_enter(lock)
 #define spin_unlock_irqrestore(lock, flags)	mtx_leave(lock)
 /* Compat defines for NetBSD API */
 #define curlwp			curproc
 #define LINESW(tp)				(linesw[(tp)->t_line])
 #define selnotify(sel, band, note)		selwakeup(sel)
 @@ -471,27 +471,29 @@ struct td_ring {
 	// One page of page_size per td
 	void **pages;
 	dma_addr_t *pages_phys;
 };
 #define TD_MAX_PAGE_SIZE 16384
 struct queue_pair {
 	struct xmm_dev *xmm;
 	u8 depth;
 	u16 page_size;
 	int tty_index;
 	int tty_needs_wake;
 #ifdef __linux__
 	struct device dev;
 #endif
 	int num;
 	int open;
 	struct mutex lock;
 	unsigned char user_buf[TD_MAX_PAGE_SIZE];
 	wait_queue_head_t wq;
 #ifdef __linux__
 	struct cdev cdev;
 	struct tty_port port;
 #endif
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 	struct selinfo selr, selw;
 #endif
 @@ -2210,29 +2212,29 @@ wwanc_attach(struct device *parent, stru
 #ifdef __NetBSD__
 	if (pci_intr_alloc(pa, &ih, NULL, 0)) {
 		printf(": can't map interrupt\n");
 		goto fail;
+	}
 	sc->sc_pih = ih[0];
 	intrstr = pci_intr_string(pa->pa_pc, ih[0], intrbuf, sizeof(intrbuf));
 	aprint_normal(": LTE modem\n");
 	aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
 #endif
 	/* Device initialized, can establish the interrupt now */
 	sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_pih, IPL_NET,
-	    wwanc_intr, sc, sc->sc_dev->dv_xname);
+	    wwanc_intr, sc, device_xname(sc->sc_dev));
 	if (sc->sc_ih == NULL) {
-		printf("%s: can't establish interrupt\n", self->dv_xname);
+		device_printf(self, "can't establish interrupt\n");
 		return;
+	}
 #ifdef __NetBSD__
 	if (!pmf_device_register(self, wwanc_pmf_suspend, wwanc_pmf_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 #endif
 	/*
 	 * Device initialization requires working interrupts, so need
 	 * to postpone this until they are enabled.
 	 */
 	config_mountroot(self, wwanc_attach_finish);
 @@ -2343,28 +2345,28 @@ wwanc_defer_resume(void *xarg)
 static int
 wwanc_activate(struct device *self, int act)
+{
 	struct wwanc_softc *sc = device_private(self);
 	switch (act) {
 	case DVACT_QUIESCE:
 		(void)config_activate_children(self, act);
 		break;
 	case DVACT_SUSPEND:
 		if (sc->sc_resume) {
 			/* Refuse to suspend if resume still ongoing */
-			printf("%s: not suspending, resume still ongoing\n",
+			device_printf(self,
-			    self->dv_xname);
+			    "not suspending, resume still ongoing\n");
 			return EBUSY;
+		}
 		(void)config_activate_children(self, act);
 		wwanc_suspend(self);
 		break;
 	case DVACT_RESUME:
 		/*
 		 * Modem reinitialization can take several seconds, defer
 		 * it via kernel thread to avoid blocking the resume.
 		 */
 		sc->sc_resume = true;
 		kthread_create(wwanc_defer_resume, self, NULL, "wwancres");
 @@ -2850,38 +2852,38 @@ wwanckqfilter(dev_t dev, struct knote *k
 static void *
 dma_alloc_coherent(struct device *self, size_t sz, dma_addr_t *physp, int flags)
+{
 	struct wwanc_softc *sc = device_private(self);
 	bus_dma_segment_t seg;
 	int nsegs;
 	int error;
 	caddr_t kva;
 	error = bus_dmamem_alloc(sc->sc_dmat, sz, 0, 0, &seg, 1, &nsegs,
 	    BUS_DMA_WAITOK);
 	if (error) {
 		panic("%s: bus_dmamem_alloc(%lu) failed %d\n",
-		    self->dv_xname, (unsigned long)sz, error);
+		    device_xname(self), (unsigned long)sz, error);
 		/* NOTREACHED */
+	}
 	KASSERT(nsegs == 1);
 	KASSERT(seg.ds_len == round_page(sz));
 	error = bus_dmamem_map(sc->sc_dmat, &seg, nsegs, sz, &kva,
 	    BUS_DMA_WAITOK | BUS_DMA_COHERENT);
 	if (error) {
 		panic("%s: bus_dmamem_alloc(%lu) failed %d\n",
-		    self->dv_xname, (unsigned long)sz, error);
+		    device_xname(self), (unsigned long)sz, error);
 		/* NOTREACHED */
+	}
 	memset(kva, 0, sz);
 	*physp = seg.ds_addr;
 	return (void *)kva;
+}
 static void
 dma_free_coherent(struct device *self, size_t sz, volatile void *vaddr, dma_addr_t phys)
+{
 	struct wwanc_softc *sc = device_private(self);
 	bus_dma_segment_t seg;
 @@ -3226,27 +3228,28 @@ wwan_attach(struct device *parent, struc
 	xmm7360_qp_start(xn->qp);
 	xmm->net = xn;
 	ifp->if_softc = sc_if;
 	ifp->if_flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST \
 		| IFF_SIMPLEX;
 	ifp->if_ioctl = wwan_if_ioctl;
 	ifp->if_start = wwan_if_start;
 	ifp->if_mtu = 1500;
 	ifp->if_hardmtu = 1500;
 	ifp->if_type = IFT_OTHER;
 	IFQ_SET_MAXLEN(&ifp->if_snd, xn->qp->depth);
 	IFQ_SET_READY(&ifp->if_snd);
-	bcopy(sc_if->sc_dev->dv_xname, ifp->if_xname, IFNAMSIZ);
+	CTASSERT(DEVICE_XNAME_SIZE == IFNAMSIZ);
 	bcopy(device_xname(sc_if->sc_dev), ifp->if_xname, IFNAMSIZ);
 	/* Call MI attach routines. */
 	if_attach(ifp);
 	/* Hook custom input and output processing, and dummy sadl */
 	ifp->if_output = wwan_if_output;
 	if_ih_insert(ifp, wwan_if_input, NULL);
 	if_deferred_start_init(ifp, NULL);
 	if_alloc_sadl(ifp);
 #if NBPFILTER > 0
 #ifdef __OpenBSD__
 	bpfattach(&ifp->if_bpf, ifp, DLT_LOOP, sizeof(u_int32_t));
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vhci.c,v 1.22 2021/08/07 16:19:17 thorpej Exp $ */
+/*	$NetBSD: vhci.c,v 1.23 2022/02/12 03:24:36 riastradh Exp $ */
 /*
  * Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.22 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.23 2022/02/12 03:24:36 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 @@ -1289,27 +1289,27 @@ vhci_match(device_t parent, cfdata_t mat
+}
 static void
 vhci_attach(device_t parent, device_t self, void *aux)
+{
 	vhci_softc_t *sc = device_private(self);
 	vhci_port_t *port;
 	uint8_t addr;
 	size_t i;
 	sc->sc_dev = self;
 	sc->sc_bus.ub_revision = USBREV_2_0;
 	sc->sc_bus.ub_hctype = USBHCTYPE_VHCI;
-	sc->sc_bus.ub_busnum = self->dv_unit;
+	sc->sc_bus.ub_busnum = device_unit(self);
 	sc->sc_bus.ub_usedma = false;
 	sc->sc_bus.ub_methods = &vhci_bus_methods;
 	sc->sc_bus.ub_pipesize = sizeof(vhci_pipe_t);
 	sc->sc_bus.ub_hcpriv = sc;
 	sc->sc_dying = false;
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	sc->sc_nports = VHCI_NPORTS;
 	for (i = 0; i < sc->sc_nports; i++) {
 		port = &sc->sc_port[i];
 		mutex_init(&port->lock, MUTEX_DEFAULT, IPL_SOFTUSB);
 		for (addr = 0; addr < VHCI_NADDRS; addr++) {
 			TAILQ_INIT(&port->endpoints[addr].usb_to_host);

 @@ -1,14 +1,14 @@
-/* $NetBSD: kern_drvctl.c,v 1.49 2021/06/16 00:19:46 riastradh Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.50 2022/02/12 03:24:36 riastradh Exp $ */
 /*
  * Copyright (c) 2004
  * 	Matthias Drochner.  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.
 @@ -17,27 +17,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 THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.49 2021/06/16 00:19:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.50 2022/02/12 03:24:36 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/kmem.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/select.h>
 @@ -267,27 +267,28 @@ detachdevbyname(const char *devname)
+	}
 	if (d == NULL) {
 		error = ENXIO;
 		goto out;
+	}
 #ifndef XXXFULLRISK
 	/*
 	 * If the parent cannot be notified, it might keep
 	 * pointers to the detached device.
 	 * There might be a private notification mechanism,
 	 * but better play it safe here.
 	 */
-	if (d->dv_parent && !d->dv_parent->dv_cfattach->ca_childdetached) {
+	if (device_parent(d) &&
 	    !device_cfattach(device_parent(d))->ca_childdetached) {
 		error = ENOTSUP;
 		goto out;
+	}
 #endif
 	error = config_detach(d, 0);
 out:	deviter_release(&di);
 	return error;
+}
 static int
 rescanbus(const char *busname, const char *ifattr,
 	  int numlocators, const int *locators)
 @@ -304,47 +305,47 @@ rescanbus(const char *busname, const cha
 	for (i = 0; i < MAXLOCATORS; i++)
 		locs[i] = -1;
 	for (i = 0; i < numlocators;i++)
 		locs[i] = locators[i];
 	if ((d = device_find_by_xname(busname)) == NULL)
 		return ENXIO;
 	/*
 	 * must support rescan, and must have something
 	 * to attach to
 	 */
-	if (!d->dv_cfattach->ca_rescan ||
+	if (!device_cfattach(d)->ca_rescan ||
-	    !d->dv_cfdriver->cd_attrs)
+	    !device_cfdriver(d)->cd_attrs)
 		return ENODEV;
 	/* rescan all ifattrs if none is specified */
 	if (!ifattr) {
 		rc = 0;
-		for (ap = d->dv_cfdriver->cd_attrs; *ap; ap++) {
+		for (ap = device_cfdriver(d)->cd_attrs; *ap; ap++) {
-			rc = (*d->dv_cfattach->ca_rescan)(d, (*ap)->ci_name,
+			rc = (*device_cfattach(d)->ca_rescan)(d,
-			    locs);
+			    (*ap)->ci_name, locs);
 			if (rc)
 				break;
+		}
 	} else {
 		/* check for valid attribute passed */
-		for (ap = d->dv_cfdriver->cd_attrs; *ap; ap++)
+		for (ap = device_cfdriver(d)->cd_attrs; *ap; ap++)
 			if (!strcmp((*ap)->ci_name, ifattr))
 				break;
 		if (!*ap)
 			return EINVAL;
-		rc = (*d->dv_cfattach->ca_rescan)(d, ifattr, locs);
+		rc = (*device_cfattach(d)->ca_rescan)(d, ifattr, locs);
+	}
 	config_deferred(NULL);
 	return rc;
+}
 static int
 drvctl_read(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
     int flags)
+{
 	return ENODEV;
+}

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: iop.4,v 1.22 2017/07/03 21:30:58 wiz Exp $
+.\"	$NetBSD: iop.4,v 1.23 2022/02/12 03:24:34 riastradh Exp $
 .\"
 .\" Copyright (c) 2000, 2001, 2007 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.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -159,27 +159,27 @@ attach or detach devices as necessary.
 Note that higher-level reconfiguration tasks (such as logically
 re-scanning SCSI busses) will not be performed by this ioctl.
 .It Dv IOPIOCGTIDMAP (struct iovec)
 Retrieve the TID to device map.
 This map indicates which targets are
 configured, and what the corresponding device name for each is.
 Although at any given point it contains the same number of entries
 as the LCT, the number of entries should be determined using the
 iov_len field from the returned iovec.
 .Bd -literal
 struct iop_tidmap {
 	u_short	it_tid;
 	u_short	it_flags;
-	char	it_dvname[sizeof(((struct device *)NULL)->dv_xname)];
+	char	it_dvname[16];	/* DEVICE_XNAME_SIZE */
 };
 #define	IT_CONFIGURED	0x02	/* target configured */
 .Ed
 .El
 .Sh FILES
 .Bl -tag -width /dev/iopn -compact
 .It Pa /dev/iop Ns Ar u
 control device for IOP unit
 .Ar u
 .El
 .Sh SEE ALSO
 .Xr dpti 4 ,
 .Xr intro 4 ,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: epcom.c,v 1.34 2021/11/21 08:44:28 skrll Exp $ */
+/*	$NetBSD: epcom.c,v 1.35 2022/02/12 03:24:34 riastradh Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jesse Off
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ichiro FUKUHARA and Naoto Shimazaki.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by IWAMOTO Toshihiro.
+ *
 @@ -63,27 +63,27 @@
  * 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.
+ *
  *      @(#)com.c       7.5 (Berkeley) 5/16/91
  */
 /*
  * TODO: hardware flow control
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.34 2021/11/21 08:44:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.35 2022/02/12 03:24:34 riastradh Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "epcom.h"
 #ifdef RND_COM
 #include <sys/rndsource.h>
 #endif
 /*
  * Override cnmagic(9) macro before including <sys/systm.h>.
  * We need to know if cn_check_magic triggered debugger, so set a flag.
  * Callers of cn_check_magic must declare int cn_trapped = 0;
 @@ -250,27 +250,27 @@ epcom_attach_subr(struct epcom_softc *sc
 		cn_tab->cn_dev = makedev(maj, device_unit(sc->sc_dev));
 		aprint_normal("%s: console\n", device_xname(sc->sc_dev));
+	}
 #ifdef KGDB
 	/*
 	 * Allow kgdb to "take over" this port.  If this is
 	 * the kgdb device, it has exclusive use.
 	 */
 	if (sc->sc_iot == kgdb_sc.sc_iot &&
 	    sc->sc_hwbase == kgdb_sc.sc_hwbase) {
 		SET(sc->sc_hwflags, COM_HW_KGDB);
-		printf("%s: kgdb\n", sc->sc_dev.dv_xname);
+		device_printf(sc->sc_dev, "kgdb\n");
+	}
 #endif
 	sc->sc_si = softint_establish(SOFTINT_SERIAL, epcomsoft, sc);
 #ifdef RND_COM
 	rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
 			  RND_TYPE_TTY, RND_FLAG_DEFAULT);
 #endif
 	/* if there are no enable/disable functions, assume the device
 	   is always enabled */
 	if (!sc->enable)

 @@ -17,27 +17,27 @@
  * 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.
  */
 #include "opt_omapl1x.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_psc.c,v 1.1 2013/10/02 16:48:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_psc.c,v 1.2 2022/02/12 03:24:34 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <arm/omap/omap_tipb.h>
 #include <arm/omap/omapl1x_reg.h>
 #include <arm/omap/omapl1x_misc.h>
 typedef struct omapl1xpsc_softc {
 	bus_space_tag_t		sc_iot;		/* Bus tag */
 @@ -110,25 +110,25 @@ static int
 omapl1xpsc_match(struct device *parent, struct cfdata *cf, void *aux)
+{
 	return 1;	/* XXX */
+}
 static void
 omapl1xpsc_attach(device_t parent, device_t self, void *aux)
+{
 	struct tipb_attach_args *tipb = aux;
 	sc = device_private(self);
 	sc->sc_iot = tipb->tipb_iot;
-	sc->sc_unit = self->dv_unit;
+	sc->sc_unit = device_unit(self);
 	sc->sc_addr = tipb->tipb_addr;
 	sc->sc_size = tipb->tipb_size;
 	/* Map PSC registers */
 	if (bus_space_map(sc->sc_iot, sc->sc_addr, sc->sc_size,
 , &sc->sc_ioh)) {
 		aprint_error_dev(self, "can't map psc%d mem space\n",
 				 sc->sc_unit);
 		return;
+	}
+}

 @@ -15,27 +15,27 @@
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ANY
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.2 2020/07/22 01:24:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.3 2022/02/12 03:24:34 riastradh Exp $");
 #include "opt_timer.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/clock_subr.h>
 @@ -426,27 +426,27 @@ tfprint (uint n, timer_factors_t *tfp)
 static int
 omapl1xtimer_match (device_t parent, struct cfdata *match, void *aux)
+{
 	return 1;
+}
 void
 omapl1xtimer_attach (device_t parent, device_t self, void *aux)
+{
 	struct omapl1xtmr_softc *sc = device_private(self);
 	struct tipb_attach_args *tipb = aux;
-	sc->sc_timerno = self->dv_unit;
+	sc->sc_timerno = device_unit(self);
 	sc->sc_iot = tipb->tipb_iot;
 	sc->sc_intr = tipb->tipb_intr;
 	sc->sc_addr = tipb->tipb_addr;
 	sc->sc_bot = 1; /* use the bottom timer in all cases */
 	sc->sc_size = OMAPL1X_TIMER_SIZE;
 	if (bus_space_map(sc->sc_iot, sc->sc_addr, sc->sc_size, 0, &sc->sc_ioh))
 		panic("%s: Cannot map registers", device_xname(self));
 	aprint_normal("\n");
 	aprint_naive("\n");
 	switch (sc->sc_timerno) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mvxpsec.c,v 1.9 2021/12/10 20:36:04 andvar Exp $	*/
+/*	$NetBSD: mvxpsec.c,v 1.10 2022/02/12 03:24:36 riastradh Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * 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.
+ *
 @@ -1026,27 +1026,27 @@ mvxpsec_dma_sync_packet(struct mvxpsec_s
 /*
  * Initialize MVXPSEC Internal SRAM
+ *
  * - must be called after DMA initizlization.
  * - make VM mapping for SRAM area on MBus.
  */
 STATIC int
 mvxpsec_init_sram(struct mvxpsec_softc *sc)
+{
 	uint32_t tag, target, attr, base, size;
 	vaddr_t va;
 	int window;
-	switch (sc->sc_dev->dv_unit) {
+	switch (device_unit(sc->sc_dev)) {
 	case 0:
 		tag = ARMADAXP_TAG_CRYPT0;
 		break;
 	case 1:
 		tag = ARMADAXP_TAG_CRYPT1;
 		break;
 	default:
 		aprint_error_dev(sc->sc_dev, "no internal SRAM mapping\n");
 		return -1;
+	}
 	window = mvsoc_target(tag, &target, &attr, &base, &size);
 	if (window >= nwindow) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fbvar.h,v 1.13 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: fbvar.h,v 1.14 2022/02/12 03:24:35 riastradh Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -43,27 +43,27 @@
 #include <sys/event.h>		/* for struct knote */
 /*
  * Frame buffer variables.  All frame buffer drivers must provide the
  * following in order to participate.
  */
 struct fbcmap;
 struct fbdevice {
 	struct	fbtype fb_fbtype;	/* see fbio.h */
 	struct	fbdriver *fb_driver;	/* pointer to driver */
 	void *fb_private;		/* for fb driver use */
-	const char *fb_name;		/* i.e. sc_dev->dv_xname */
+	const char *fb_name;		/* i.e. device_xname(sc_dev) */
 	void *	fb_pixels;		/* display RAM */
 	int	fb_linebytes;		/* bytes per display line */
 	int	fb_flags;		/* copy of cf_flags */
 	/* This points to the P4 register if the FB has one. */
 	volatile uint32_t *fb_pfour;
 	/*
 	 * XXX - The "Raster console" stuff could be stored
 	 * in the driver specific structure at fb_private
 	 * if needed.