Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:41:05 UTC 2009
Modified Files:
src/sys/dev/pci: oboe.c
Log Message:
Remove superfluous activation hook.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/oboe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.35 src/sys/dev/pci/oboe.c:1.36
--- src/sys/dev/pci/oboe.c:1.35 Tue May 12 08:23:01 2009
+++ src/sys/dev/pci/oboe.c Thu Nov 12 19:41:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.35 2009/05/12 08:23:01 cegger Exp $ */
+/* $NetBSD: oboe.c,v 1.36 2009/11/12 19:41:05 dyoung Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.35 2009/05/12 08:23:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.36 2009/11/12 19:41:05 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,6 @@
static int oboe_match(device_t parent, cfdata_t match, void *aux);
static void oboe_attach(device_t parent, device_t self, void *aux);
-static int oboe_activate(device_t self, enum devact act);
static int oboe_detach(device_t self, int flags);
static int oboe_open(void *h, int flag, int mode, struct lwp *l);
@@ -153,7 +152,7 @@
static int oboe_setbaud(struct oboe_softc *, int);
CFATTACH_DECL(oboe, sizeof(struct oboe_softc),
- oboe_match, oboe_attach, oboe_detach, oboe_activate);
+ oboe_match, oboe_attach, oboe_detach, NULL);
static struct irframe_methods oboe_methods = {
oboe_open, oboe_close, oboe_read, oboe_write, oboe_poll,
@@ -244,27 +243,6 @@
}
static int
-oboe_activate(device_t self, enum devact act)
-{
- struct oboe_softc *sc = device_private(self);
- int error = 0;
-
- DPRINTF(("%s: sc=%p\n", __func__, sc));
-
- switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
- case DVACT_DEACTIVATE:
- if (sc->sc_child != NULL)
- error = config_deactivate(sc->sc_child);
- break;
- }
- return (error);
-}
-
-static int
oboe_detach(device_t self, int flags)
{
struct oboe_softc *sc = device_private(self);
