diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-03 15:47:19 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-07-03 15:47:19 +0000 |
| commit | cf51fdce33cceb21f045884bd8ac674d82bb7fa5 (patch) | |
| tree | ad92547f0dfd94e3390a439ec1017fd1b84ca374 /sys/kern | |
| parent | 2c5191c2d7257540905a986a7260a29cf5424ae8 (diff) | |
Remove config_activate() and DVACT_ACTIVATE. PCMCIA's the only thing
that's ever used it, and it's long since been changed to use
DVACT_{QUIESCE,SUSPEND,RESUME} instead.
ok deraadt@, dlg@; miod@ also agreed with this idea when I brought it
up a few weeks ago
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_autoconf.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 57324b0bfb5..d43827e8db4 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.65 2011/06/20 17:05:46 deraadt Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.66 2011/07/03 15:47:16 matthew Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -648,24 +648,6 @@ done: } int -config_activate(struct device *dev) -{ - struct cfattach *ca = dev->dv_cfdata->cf_attach; - int rv = 0, oflags = dev->dv_flags; - - if (ca->ca_activate == NULL) - return (EOPNOTSUPP); - - if ((dev->dv_flags & DVF_ACTIVE) == 0) { - dev->dv_flags |= DVF_ACTIVE; - rv = (*ca->ca_activate)(dev, DVACT_ACTIVATE); - if (rv) - dev->dv_flags = oflags; - } - return (rv); -} - -int config_deactivate(struct device *dev) { struct cfattach *ca = dev->dv_cfdata->cf_attach; @@ -817,9 +799,6 @@ config_activate_children(struct device *parent, int act) if (d->dv_parent != parent) continue; switch (act) { - case DVACT_ACTIVATE: - rv = config_activate(d); - break; case DVACT_SUSPEND: case DVACT_RESUME: case DVACT_QUIESCE: |