summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2010-09-12 03:17:35 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2010-09-12 03:17:35 +0000
commit570c5986aba082580f9e18bcba598744121eefb0 (patch)
treeb29c9e0d1326e91c5f5c4878055682e9cf545cf8 /sys/dev/pci
parent04ec42fb755abb5456dd12836cd9672309b4c47d (diff)
silly me. use the switch() variable, not the case value.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/auich.c6
-rw-r--r--sys/dev/pci/auvia.c6
-rw-r--r--sys/dev/pci/azalia.c6
-rw-r--r--sys/dev/pci/cmpci.c6
-rw-r--r--sys/dev/pci/cs4280.c6
-rw-r--r--sys/dev/pci/emuxki.c6
6 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index cb9d5939ead..6d66b6ec0e5 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.92 2010/09/12 02:04:31 jakemsr Exp $ */
+/* $OpenBSD: auich.c,v 1.93 2010/09/12 03:17:34 jakemsr Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -566,13 +566,13 @@ auich_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
break;
case DVACT_RESUME:
auich_resume(sc);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
if (sc->audiodev != NULL)
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 3cd1986f64d..adde9086c00 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auvia.c,v 1.46 2010/09/12 02:03:35 jakemsr Exp $ */
+/* $OpenBSD: auvia.c,v 1.47 2010/09/12 03:17:34 jakemsr Exp $ */
/* $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $ */
/*-
@@ -246,13 +246,13 @@ auvia_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
break;
case DVACT_RESUME:
auvia_resume(sc);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
break;
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 6bd6637af89..b8558328bdb 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.c,v 1.187 2010/09/12 02:35:10 jakemsr Exp $ */
+/* $OpenBSD: azalia.c,v 1.188 2010/09/12 03:17:34 jakemsr Exp $ */
/* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */
/*-
@@ -540,14 +540,14 @@ azalia_pci_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
azalia_suspend(sc);
break;
case DVACT_RESUME:
azalia_resume(sc);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
if (sc->audiodev != NULL)
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 1d1c391a2db..ae85cf90b2e 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmpci.c,v 1.27 2010/09/12 02:06:54 jakemsr Exp $ */
+/* $OpenBSD: cmpci.c,v 1.28 2010/09/12 03:17:34 jakemsr Exp $ */
/* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */
/*
@@ -529,13 +529,13 @@ cmpci_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
break;
case DVACT_RESUME:
cmpci_resume(sc);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
break;
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index 77cf8029673..fad800d5496 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4280.c,v 1.37 2010/09/12 02:05:41 jakemsr Exp $ */
+/* $OpenBSD: cs4280.c,v 1.38 2010/09/12 03:17:34 jakemsr Exp $ */
/* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */
/*
@@ -1835,7 +1835,7 @@ cs4280_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
/* should I powerdown here ? */
@@ -1846,7 +1846,7 @@ cs4280_activate(struct device *self, int act)
cs4280_init(sc, 0);
cs4280_init2(sc, 0);
ac97_resume(&sc->host_if, sc->codec_if);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
break;
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index ad7dc2717fc..4ce878bbd8d 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emuxki.c,v 1.36 2010/09/12 02:10:52 jakemsr Exp $ */
+/* $OpenBSD: emuxki.c,v 1.37 2010/09/12 03:17:34 jakemsr Exp $ */
/* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */
/*-
@@ -537,14 +537,14 @@ emuxki_activate(struct device *self, int act)
case DVACT_ACTIVATE:
break;
case DVACT_QUIESCE:
- rv = config_activate_children(self, DVACT_QUIESCE);
+ rv = config_activate_children(self, act);
break;
case DVACT_SUSPEND:
break;
case DVACT_RESUME:
emuxki_scinit(sc, 1);
ac97_resume(&sc->hostif, sc->codecif);
- rv = config_activate_children(self, DVACT_RESUME);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
break;