Thu Mar 3 06:27:21 2022 UTC ()
mips: Use device_set_private in a few drivers.


(riastradh)
diff -r1.5 -r1.6 src/sys/arch/evbmips/gdium/bonito_mainbus.c
diff -r1.5 -r1.6 src/sys/arch/evbmips/loongson/bonito_mainbus.c
diff -r1.8 -r1.9 src/sys/arch/mips/sibyte/pci/sbbrz.c

cvs diff -r1.5 -r1.6 src/sys/arch/evbmips/gdium/bonito_mainbus.c (expand / switch to context diff)
--- src/sys/arch/evbmips/gdium/bonito_mainbus.c 2021/08/07 16:18:51 1.5
+++ src/sys/arch/evbmips/gdium/bonito_mainbus.c 2022/03/03 06:27:20 1.6
@@ -1,4 +1,4 @@
-/*	$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.
@@ -30,7 +30,7 @@
  */
 
 #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>
@@ -70,7 +70,7 @@
 	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.

cvs diff -r1.5 -r1.6 src/sys/arch/evbmips/loongson/bonito_mainbus.c (expand / switch to context diff)
--- src/sys/arch/evbmips/loongson/bonito_mainbus.c 2021/08/07 16:18:51 1.5
+++ src/sys/arch/evbmips/loongson/bonito_mainbus.c 2022/03/03 06:27:21 1.6
@@ -1,4 +1,4 @@
-/*	$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.
@@ -30,7 +30,7 @@
  */
 
 #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>
@@ -73,7 +73,7 @@
 	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

cvs diff -r1.8 -r1.9 src/sys/arch/mips/sibyte/pci/sbbrz.c (expand / switch to context diff)
--- src/sys/arch/mips/sibyte/pci/sbbrz.c 2022/01/22 15:10:31 1.8
+++ src/sys/arch/mips/sibyte/pci/sbbrz.c 2022/03/03 06:27:21 1.9
@@ -1,4 +1,4 @@
-/* $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
@@ -181,7 +181,7 @@
 
 	/* 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