summaryrefslogtreecommitdiff
path: root/sys/arch/i386/pci
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-05-30 16:15:03 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-05-30 16:15:03 +0000
commit0a2136fff807fb71339f3d499b31f09ef14bf891 (patch)
tree8996416e2647c8beebebaa3a97c2205aed0adce3 /sys/arch/i386/pci
parent52c68f7659b12bec7c8ef0539aca056f2550327b (diff)
Enforce ca_activate tree-walks over the entire heirarchy for all events,
cleaning up some shutdown-hook related code on the way. (A few drivers related to sparc are still skipped at kettenis' request) ok kettenis mlarkin, tested by many others too
Diffstat (limited to 'sys/arch/i386/pci')
-rw-r--r--sys/arch/i386/pci/ichpcib.c8
-rw-r--r--sys/arch/i386/pci/pcib.c5
-rw-r--r--sys/arch/i386/pci/piixpcib.c6
3 files changed, 6 insertions, 13 deletions
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c
index c35e2259130..eb1afd62779 100644
--- a/sys/arch/i386/pci/ichpcib.c
+++ b/sys/arch/i386/pci/ichpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichpcib.c,v 1.26 2012/08/16 18:42:04 tedu Exp $ */
+/* $OpenBSD: ichpcib.c,v 1.27 2013/05/30 16:15:01 deraadt Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -68,11 +68,7 @@ struct timecounter ichpcib_timecounter = {
};
struct cfattach ichpcib_ca = {
- sizeof(struct ichpcib_softc),
- ichpcib_match,
- ichpcib_attach,
- NULL,
- config_activate_children
+ sizeof(struct ichpcib_softc), ichpcib_match, ichpcib_attach
};
struct cfdriver ichpcib_cd = {
diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c
index 75bffbe51e4..aa620748d31 100644
--- a/sys/arch/i386/pci/pcib.c
+++ b/sys/arch/i386/pci/pcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcib.c,v 1.23 2010/07/08 20:17:54 deraadt Exp $ */
+/* $OpenBSD: pcib.c,v 1.24 2013/05/30 16:15:01 deraadt Exp $ */
/* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */
/*-
@@ -54,8 +54,7 @@ void pcib_callback(struct device *);
int pcib_print(void *, const char *);
struct cfattach pcib_ca = {
- sizeof(struct device), pcibmatch, pcibattach, NULL,
- config_activate_children
+ sizeof(struct device), pcibmatch, pcibattach
};
struct cfdriver pcib_cd = {
diff --git a/sys/arch/i386/pci/piixpcib.c b/sys/arch/i386/pci/piixpcib.c
index cc0370ea5e1..b94d5fc6f0d 100644
--- a/sys/arch/i386/pci/piixpcib.c
+++ b/sys/arch/i386/pci/piixpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: piixpcib.c,v 1.7 2010/07/08 20:17:54 deraadt Exp $ */
+/* $OpenBSD: piixpcib.c,v 1.8 2013/05/30 16:15:01 deraadt Exp $ */
/*
* Copyright (c) 2007 Stefan Sperling <stsp@stsp.in-berlin.de>
@@ -117,9 +117,7 @@ extern void p3_update_cpuspeed(void);
struct cfattach piixpcib_ca = {
sizeof(struct piixpcib_softc),
piixpcib_match,
- piixpcib_attach,
- NULL,
- config_activate_children
+ piixpcib_attach
};
struct cfdriver piixpcib_cd = {