Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:39:26 UTC 2009
Modified Files:
src/sys/dev/pci: auich.c
Log Message:
Remove superfluous activation hook.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/pci/auich.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/auich.c
diff -u src/sys/dev/pci/auich.c:1.130 src/sys/dev/pci/auich.c:1.131
--- src/sys/dev/pci/auich.c:1.130 Thu Sep 3 14:29:42 2009
+++ src/sys/dev/pci/auich.c Thu Nov 12 19:39:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.130 2009/09/03 14:29:42 sborrill Exp $ */
+/* $NetBSD: auich.c,v 1.131 2009/11/12 19:39:26 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.130 2009/09/03 14:29:42 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.131 2009/11/12 19:39:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,12 +248,10 @@
static void auich_attach(device_t, device_t, void *);
static int auich_detach(device_t, int);
static void auich_childdet(device_t, device_t);
-static int auich_activate(device_t, enum devact);
static int auich_intr(void *);
CFATTACH_DECL2_NEW(auich, sizeof(struct auich_softc),
- auich_match, auich_attach, auich_detach, auich_activate, NULL,
- auich_childdet);
+ auich_match, auich_attach, auich_detach, NULL, NULL, auich_childdet);
static int auich_open(void *, int);
static void auich_close(void *);
@@ -689,24 +687,6 @@
return; /* failure of sysctl is not fatal. */
}
-static int
-auich_activate(device_t self, enum devact act)
-{
- struct auich_softc *sc = device_private(self);
- int ret;
-
- ret = 0;
- switch (act) {
- case DVACT_ACTIVATE:
- return EOPNOTSUPP;
- case DVACT_DEACTIVATE:
- if (sc->sc_audiodev != NULL)
- ret = config_deactivate(sc->sc_audiodev);
- return ret;
- }
- return EOPNOTSUPP;
-}
-
static void
auich_childdet(device_t self, device_t child)
{
