 @@ -1,14 +1,14 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.5 2021/08/07 16:18:51 thorpej Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.6 2022/03/03 06:27:20 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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: bonito_mainbus.c,v 1.5 2021/08/07 16:18:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.6 2022/03/03 06:27:20 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <mips/bonito/bonitoreg.h>
 #include <evbmips/gdium/gdiumvar.h>
 @@ -60,27 +60,27 @@ bonito_mainbus_match(device_t parent, cf
 	if (strcmp(maa->maa_name, bonito_cd.cd_name) == 0)
 		return (1);
 	return (0);
+}
 void
 bonito_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcibus_attach_args pba;
 	struct gdium_config * const gc = &gdium_configuration;
 	pcireg_t rev;
-	self->dv_private = &gc->gc_bonito;
+	device_set_private(self, &gc->gc_bonito);
 	/*
 	 * There is only one PCI controller on a Loongson chip.
 	 */
 	rev = PCI_REVISION(REGVAL(BONITO_PCICLASS));
 	printf(": BONITO Memory and PCI controller, %s rev. %d.%d\n",
 	    BONITO_REV_FPGA(rev) ? "FPGA" : "ASIC",
 	    BONITO_REV_MAJOR(rev), BONITO_REV_MINOR(rev));
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	pba.pba_bus = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.5 2021/08/07 16:18:51 thorpej Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.6 2022/03/03 06:27:21 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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: bonito_mainbus.c,v 1.5 2021/08/07 16:18:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.6 2022/03/03 06:27:21 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <mips/cpuregs.h>
 #include <mips/bonito/bonitoreg.h>
 #include <evbmips/loongson/autoconf.h>
 @@ -63,27 +63,27 @@ bonito_mainbus_match(device_t parent, cf
 	if (strcmp(maa->maa_name, bonito_cd.cd_name) == 0)
 		return (1);
 	return (0);
+}
 void
 bonito_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcibus_attach_args pba;
 	pcireg_t rev;
 	bool compatible;
-	self->dv_private = __UNCONST(&sys_platform->bonito_config);
+	device_set_private(self, __UNCONST(&sys_platform->bonito_config));
 	/*
 	 * Loongson 2F processors do not use a real Bonito64 chip but
 	 * their own derivative, which is no longer 100% compatible.
 	 * We need to make sure we never try to access an unimplemented
 	 * register...
 	 */
 	if (loongson_ver >= 0x2f)
 		compatible = false;
 	else
 		compatible = true;
 	/*

 @@ -1,14 +1,14 @@
-/* $NetBSD: sbbrz.c,v 1.8 2022/01/22 15:10:31 skrll Exp $ */
+/* $NetBSD: sbbrz.c,v 1.9 2022/03/03 06:27:21 riastradh 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
 @@ -171,27 +171,27 @@ sbbrz_attach(device_t parent, device_t s
 	struct sbbrz_softc *sc = &sbbrz_softc;
 	struct pcibus_attach_args pba;
         uint64_t regval;
         bool host;
         /* Tell the user whether it's host or device mode. */
         regval = mips3_ld((register_t)MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_CFG));
         host = (regval & M_SYS_PCI_HOST) != 0;
         aprint_normal(": %s pci mode\n", host ? "host" : "device");
 	/* note that we've attached the bridge; can't have two. */
 	sc->sc_dev = self;
-	self->dv_private = sc;
+	device_set_private(self, sc);
 	/*
          * set up the bridge's info; done once at console init time
 	 * (maybe), but doesn't hurt to do twice.
 	 */
         sbbrz_init(sc);
 #if _has_pba_busname
 	pba.pba_busname = "pci";
 #endif
 	pba.pba_iot = &sc->sc_iot;
 	pba.pba_memt = &sc->sc_memt;
 	pba.pba_dmat64 = &sc->sc_dmat64;