Module Name: src
Committed By: dyoung
Date: Wed Sep 16 22:45:24 UTC 2009
Modified Files:
src/sys/kern: subr_autoconf.c
src/sys/sys: device.h
Log Message:
Nothing calls config_activate(9) any longer, so delete it.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.122 -r1.123 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.183 src/sys/kern/subr_autoconf.c:1.184
--- src/sys/kern/subr_autoconf.c:1.183 Wed Sep 16 16:34:50 2009
+++ src/sys/kern/subr_autoconf.c Wed Sep 16 22:45:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.183 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.184 2009/09/16 22:45:24 dyoung Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.183 2009/09/16 16:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.184 2009/09/16 22:45:24 dyoung Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1491,24 +1491,6 @@
}
int
-config_activate(device_t dev)
-{
- const struct cfattach *ca = dev->dv_cfattach;
- 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(device_t dev)
{
const struct cfattach *ca = dev->dv_cfattach;
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.122 src/sys/sys/device.h:1.123
--- src/sys/sys/device.h:1.122 Wed Sep 16 16:34:56 2009
+++ src/sys/sys/device.h Wed Sep 16 22:45:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.122 2009/09/16 16:34:56 dyoung Exp $ */
+/* $NetBSD: device.h,v 1.123 2009/09/16 22:45:23 dyoung Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -457,7 +457,6 @@
int config_detach(device_t, int);
int config_detach_children(device_t, int flags);
bool config_detach_all(int);
-int config_activate(device_t);
int config_deactivate(device_t);
void config_defer(device_t, void (*)(device_t));
void config_deferred(device_t);
