Module Name: src
Committed By: jmcneill
Date: Tue Nov 22 22:47:12 UTC 2011
Modified Files:
src/sys/arch/amiga/dev [jmcneill-audiomp3]: aucc.c repulse.c toccata.c
src/sys/arch/arm/iomd [jmcneill-audiomp3]: vidcaudio.c
src/sys/arch/arm/xscale [jmcneill-audiomp3]: pxa2x0_ac97.c
src/sys/arch/dreamcast/dev/g2 [jmcneill-audiomp3]: aica.c
src/sys/arch/hp700/gsc [jmcneill-audiomp3]: harmony.c
src/sys/arch/hpcmips/vr [jmcneill-audiomp3]: vraiu.c
src/sys/arch/macppc/dev [jmcneill-audiomp3]: awacs.c snapper.c
src/sys/arch/prep/isa [jmcneill-audiomp3]: paud_isa.c
src/sys/arch/sgimips/hpc [jmcneill-audiomp3]: haltwo.c
src/sys/arch/sgimips/mace [jmcneill-audiomp3]: mavb.c
src/sys/arch/sparc/dev [jmcneill-audiomp3]: audioamd.c
src/sys/arch/x68k/dev [jmcneill-audiomp3]: vs.c
src/sys/arch/zaurus/dev [jmcneill-audiomp3]: zaudio.c
src/sys/dev [jmcneill-audiomp3]: audio_if.h
src/sys/dev/bluetooth [jmcneill-audiomp3]: btsco.c
src/sys/dev/ebus [jmcneill-audiomp3]: cs4231_ebus.c
src/sys/dev/ic [jmcneill-audiomp3]: tms320av110.c
src/sys/dev/isa [jmcneill-audiomp3]: aria.c ess.c gus.c pas.c sb.c
wss.c ym.c
src/sys/dev/isapnp [jmcneill-audiomp3]: gus_isapnp.c
src/sys/dev/pci [jmcneill-audiomp3]: auacer.c auich.c auixp.c autri.c
auvia.c azalia.c cmpci.c cs4280.c cs4281.c eap.c emuxki.c esa.c
esm.c eso.c fms.c gcscaudio.c neo.c sv.c yds.c
src/sys/dev/sbus [jmcneill-audiomp3]: cs4231_sbus.c
src/sys/dev/tc [jmcneill-audiomp3]: bba.c
src/sys/dev/usb [jmcneill-audiomp3]: uaudio.c
Log Message:
get rid of unused 'powerstate' callback in audio_hw_if
To generate a diff of this commit:
cvs rdiff -u -r1.40.104.1 -r1.40.104.2 src/sys/arch/amiga/dev/aucc.c
cvs rdiff -u -r1.17.4.2 -r1.17.4.3 src/sys/arch/amiga/dev/repulse.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.46.40.1 -r1.46.40.2 src/sys/arch/arm/iomd/vidcaudio.c
cvs rdiff -u -r1.9.4.2 -r1.9.4.3 src/sys/arch/arm/xscale/pxa2x0_ac97.c
cvs rdiff -u -r1.21.4.1 -r1.21.4.2 src/sys/arch/dreamcast/dev/g2/aica.c
cvs rdiff -u -r1.23.4.1 -r1.23.4.2 src/sys/arch/hp700/gsc/harmony.c
cvs rdiff -u -r1.12.80.1 -r1.12.80.2 src/sys/arch/hpcmips/vr/vraiu.c
cvs rdiff -u -r1.40.6.1 -r1.40.6.2 src/sys/arch/macppc/dev/awacs.c
cvs rdiff -u -r1.36.10.1 -r1.36.10.2 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.2 src/sys/arch/prep/isa/paud_isa.c
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/arch/sgimips/hpc/haltwo.c
cvs rdiff -u -r1.7.4.3 -r1.7.4.4 src/sys/arch/sgimips/mace/mavb.c
cvs rdiff -u -r1.26.4.2 -r1.26.4.3 src/sys/arch/sparc/dev/audioamd.c
cvs rdiff -u -r1.34.4.1 -r1.34.4.2 src/sys/arch/x68k/dev/vs.c
cvs rdiff -u -r1.15.4.2 -r1.15.4.3 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.66.14.2 -r1.66.14.3 src/sys/dev/audio_if.h
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.34.4.2 -r1.34.4.3 src/sys/dev/ebus/cs4231_ebus.c
cvs rdiff -u -r1.21.36.1 -r1.21.36.2 src/sys/dev/ic/tms320av110.c
cvs rdiff -u -r1.33.10.1 -r1.33.10.2 src/sys/dev/isa/aria.c
cvs rdiff -u -r1.78.10.2 -r1.78.10.3 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.106.4.1 -r1.106.4.2 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.68.10.1 -r1.68.10.2 src/sys/dev/isa/pas.c
cvs rdiff -u -r1.88.40.1 -r1.88.40.2 src/sys/dev/isa/sb.c
cvs rdiff -u -r1.69.4.1 -r1.69.4.2 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.41.4.1 -r1.41.4.2 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.35.14.1 -r1.35.14.2 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.28.10.1 -r1.28.10.2 src/sys/dev/pci/auacer.c
cvs rdiff -u -r1.138.10.1 -r1.138.10.2 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.34.12.1 -r1.34.12.2 src/sys/dev/pci/auixp.c
cvs rdiff -u -r1.46.12.1 -r1.46.12.2 src/sys/dev/pci/autri.c
cvs rdiff -u -r1.73.10.1 -r1.73.10.2 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.77.4.1 -r1.77.4.2 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.42.14.1 -r1.42.14.2 src/sys/dev/pci/cmpci.c
cvs rdiff -u -r1.61.6.1 -r1.61.6.2 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.44.12.1 -r1.44.12.2 src/sys/dev/pci/cs4281.c
cvs rdiff -u -r1.92.36.1 -r1.92.36.2 src/sys/dev/pci/eap.c
cvs rdiff -u -r1.59.14.3 -r1.59.14.4 src/sys/dev/pci/emuxki.c
cvs rdiff -u -r1.54.12.1 -r1.54.12.2 src/sys/dev/pci/esa.c
cvs rdiff -u -r1.53.12.1 -r1.53.12.2 src/sys/dev/pci/esm.c
cvs rdiff -u -r1.57.14.1 -r1.57.14.2 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.38.10.1 -r1.38.10.2 src/sys/dev/pci/fms.c
cvs rdiff -u -r1.7.4.3 -r1.7.4.4 src/sys/dev/pci/gcscaudio.c
cvs rdiff -u -r1.45.12.1 -r1.45.12.2 src/sys/dev/pci/neo.c
cvs rdiff -u -r1.44.14.1 -r1.44.14.2 src/sys/dev/pci/sv.c
cvs rdiff -u -r1.50.10.1 -r1.50.10.2 src/sys/dev/pci/yds.c
cvs rdiff -u -r1.48.4.3 -r1.48.4.4 src/sys/dev/sbus/cs4231_sbus.c
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/dev/tc/bba.c
cvs rdiff -u -r1.120.10.1 -r1.120.10.2 src/sys/dev/usb/uaudio.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/arch/amiga/dev/aucc.c
diff -u src/sys/arch/amiga/dev/aucc.c:1.40.104.1 src/sys/arch/amiga/dev/aucc.c:1.40.104.2
--- src/sys/arch/amiga/dev/aucc.c:1.40.104.1 Sun Nov 20 12:41:59 2011
+++ src/sys/arch/amiga/dev/aucc.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aucc.c,v 1.40.104.1 2011/11/20 12:41:59 mrg Exp $ */
+/* $NetBSD: aucc.c,v 1.40.104.2 2011/11/22 22:47:02 jmcneill Exp $ */
/*
* Copyright (c) 1999 Bernardo Innocenti
@@ -53,7 +53,7 @@
#if NAUCC > 0
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.40.104.1 2011/11/20 12:41:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.40.104.2 2011/11/22 22:47:02 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -260,7 +260,6 @@ const struct audio_hw_if sa_hw_if = {
NULL,
NULL,
NULL,
- NULL,
aucc_get_locks,
};
Index: src/sys/arch/amiga/dev/repulse.c
diff -u src/sys/arch/amiga/dev/repulse.c:1.17.4.2 src/sys/arch/amiga/dev/repulse.c:1.17.4.3
--- src/sys/arch/amiga/dev/repulse.c:1.17.4.2 Sun Nov 20 11:43:55 2011
+++ src/sys/arch/amiga/dev/repulse.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: repulse.c,v 1.17.4.2 2011/11/20 11:43:55 mrg Exp $ */
+/* $NetBSD: repulse.c,v 1.17.4.3 2011/11/22 22:47:02 jmcneill Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.17.4.2 2011/11/20 11:43:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.17.4.3 2011/11/22 22:47:02 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -123,7 +123,6 @@ const struct audio_hw_if rep_hw_if = {
/* trigger_output */ 0,
/* trigger_input */ 0,
/* dev_ioctl */ 0,
- /* powerstate */ 0,
rep_get_locks,
};
Index: src/sys/arch/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.14.4.1 src/sys/arch/amiga/dev/toccata.c:1.14.4.2
--- src/sys/arch/amiga/dev/toccata.c:1.14.4.1 Sun Nov 20 12:41:59 2011
+++ src/sys/arch/amiga/dev/toccata.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.14.4.1 2011/11/20 12:41:59 mrg Exp $ */
+/* $NetBSD: toccata.c,v 1.14.4.2 2011/11/22 22:47:02 jmcneill Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.14.4.1 2011/11/20 12:41:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.14.4.2 2011/11/22 22:47:02 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -208,7 +208,6 @@ const struct audio_hw_if audiocs_hw_if =
0, /* trigger_output */
0,
0,
- 0,
toccata_get_locks,
};
Index: src/sys/arch/arm/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.46.40.1 src/sys/arch/arm/iomd/vidcaudio.c:1.46.40.2
--- src/sys/arch/arm/iomd/vidcaudio.c:1.46.40.1 Sun Nov 20 12:58:45 2011
+++ src/sys/arch/arm/iomd/vidcaudio.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcaudio.c,v 1.46.40.1 2011/11/20 12:58:45 mrg Exp $ */
+/* $NetBSD: vidcaudio.c,v 1.46.40.2 2011/11/22 22:47:02 jmcneill Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,7 +65,7 @@
#include <sys/param.h> /* proc.h */
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.46.40.1 2011/11/20 12:58:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.46.40.2 2011/11/22 22:47:02 jmcneill Exp $");
#include <sys/audioio.h>
#include <sys/conf.h> /* autoconfig functions */
@@ -194,7 +194,6 @@ static const struct audio_hw_if vidcaudi
vidcaudio_trigger_output,
vidcaudio_trigger_input,
NULL,
- NULL,
vidcaudio_get_locks,
};
Index: src/sys/arch/arm/xscale/pxa2x0_ac97.c
diff -u src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.9.4.2 src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.9.4.3
--- src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.9.4.2 Sun Nov 20 13:47:07 2011
+++ src/sys/arch/arm/xscale/pxa2x0_ac97.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_ac97.c,v 1.9.4.2 2011/11/20 13:47:07 jmcneill Exp $ */
+/* $NetBSD: pxa2x0_ac97.c,v 1.9.4.3 2011/11/22 22:47:02 jmcneill Exp $ */
/*
* Copyright (c) 2003, 2005 Wasabi Systems, Inc.
@@ -183,7 +183,6 @@ struct audio_hw_if acu_hw_if = {
acu_trigger_output,
acu_trigger_input,
NULL,
- NULL,
acu_get_locks,
};
Index: src/sys/arch/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.21.4.1 src/sys/arch/dreamcast/dev/g2/aica.c:1.21.4.2
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.21.4.1 Sun Nov 20 15:00:35 2011
+++ src/sys/arch/dreamcast/dev/g2/aica.c Tue Nov 22 22:47:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aica.c,v 1.21.4.1 2011/11/20 15:00:35 jmcneill Exp $ */
+/* $NetBSD: aica.c,v 1.21.4.2 2011/11/22 22:47:02 jmcneill Exp $ */
/*
* Copyright (c) 2003 SHIMIZU Ryo <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.21.4.1 2011/11/20 15:00:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.21.4.2 2011/11/22 22:47:02 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,7 +194,6 @@ const struct audio_hw_if aica_hw_if = {
aica_trigger_output,
aica_trigger_input,
NULL, /* aica_dev_ioctl */
- NULL, /* aica_powerstate */
aica_get_locks,
};
Index: src/sys/arch/hp700/gsc/harmony.c
diff -u src/sys/arch/hp700/gsc/harmony.c:1.23.4.1 src/sys/arch/hp700/gsc/harmony.c:1.23.4.2
--- src/sys/arch/hp700/gsc/harmony.c:1.23.4.1 Sun Nov 20 15:23:46 2011
+++ src/sys/arch/hp700/gsc/harmony.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: harmony.c,v 1.23.4.1 2011/11/20 15:23:46 jmcneill Exp $ */
+/* $NetBSD: harmony.c,v 1.23.4.2 2011/11/22 22:47:03 jmcneill Exp $ */
/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
@@ -146,7 +146,6 @@ const struct audio_hw_if harmony_sa_hw_i
harmony_trigger_output,
harmony_trigger_input,
NULL,
- NULL,
harmony_get_locks,
};
Index: src/sys/arch/hpcmips/vr/vraiu.c
diff -u src/sys/arch/hpcmips/vr/vraiu.c:1.12.80.1 src/sys/arch/hpcmips/vr/vraiu.c:1.12.80.2
--- src/sys/arch/hpcmips/vr/vraiu.c:1.12.80.1 Sun Nov 20 14:26:34 2011
+++ src/sys/arch/hpcmips/vr/vraiu.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vraiu.c,v 1.12.80.1 2011/11/20 14:26:34 jmcneill Exp $ */
+/* $NetBSD: vraiu.c,v 1.12.80.2 2011/11/22 22:47:03 jmcneill Exp $ */
/*
* Copyright (c) 2001 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.12.80.1 2011/11/20 14:26:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.12.80.2 2011/11/22 22:47:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,7 +147,6 @@ const struct audio_hw_if vraiu_hw_if = {
NULL,
NULL,
NULL,
- NULL,
vraiu_get_locks,
};
Index: src/sys/arch/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.40.6.1 src/sys/arch/macppc/dev/awacs.c:1.40.6.2
--- src/sys/arch/macppc/dev/awacs.c:1.40.6.1 Tue Nov 22 00:48:48 2011
+++ src/sys/arch/macppc/dev/awacs.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.40.6.1 2011/11/22 00:48:48 macallan Exp $ */
+/* $NetBSD: awacs.c,v 1.40.6.2 2011/11/22 22:47:03 jmcneill Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.40.6.1 2011/11/22 00:48:48 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.40.6.2 2011/11/22 22:47:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -190,7 +190,6 @@ const struct audio_hw_if awacs_hw_if = {
awacs_trigger_output,
awacs_trigger_input,
NULL,
- NULL,
awacs_get_locks,
};
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.36.10.1 src/sys/arch/macppc/dev/snapper.c:1.36.10.2
--- src/sys/arch/macppc/dev/snapper.c:1.36.10.1 Tue Nov 22 05:54:54 2011
+++ src/sys/arch/macppc/dev/snapper.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.36.10.1 2011/11/22 05:54:54 macallan Exp $ */
+/* $NetBSD: snapper.c,v 1.36.10.2 2011/11/22 22:47:03 jmcneill Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.36.10.1 2011/11/22 05:54:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.36.10.2 2011/11/22 22:47:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -303,7 +303,6 @@ const struct audio_hw_if snapper_hw_if =
snapper_trigger_output,
snapper_trigger_input,
NULL,
- NULL,
snapper_get_locks,
};
Index: src/sys/arch/prep/isa/paud_isa.c
diff -u src/sys/arch/prep/isa/paud_isa.c:1.14.4.1 src/sys/arch/prep/isa/paud_isa.c:1.14.4.2
--- src/sys/arch/prep/isa/paud_isa.c:1.14.4.1 Sun Nov 20 16:34:08 2011
+++ src/sys/arch/prep/isa/paud_isa.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: paud_isa.c,v 1.14.4.1 2011/11/20 16:34:08 jmcneill Exp $ */
+/* $NetBSD: paud_isa.c,v 1.14.4.2 2011/11/22 22:47:03 jmcneill Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.14.4.1 2011/11/20 16:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.14.4.2 2011/11/22 22:47:03 jmcneill Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -121,7 +121,6 @@ static const struct audio_hw_if paud_hw_
ad1848_isa_trigger_output,
ad1848_isa_trigger_input,
NULL,
- NULL,
ad1848_get_locks,
};
Index: src/sys/arch/sgimips/hpc/haltwo.c
diff -u src/sys/arch/sgimips/hpc/haltwo.c:1.20.4.1 src/sys/arch/sgimips/hpc/haltwo.c:1.20.4.2
--- src/sys/arch/sgimips/hpc/haltwo.c:1.20.4.1 Sun Nov 20 12:07:27 2011
+++ src/sys/arch/sgimips/hpc/haltwo.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: haltwo.c,v 1.20.4.1 2011/11/20 12:07:27 jmcneill Exp $ */
+/* $NetBSD: haltwo.c,v 1.20.4.2 2011/11/22 22:47:03 jmcneill Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.20.4.1 2011/11/20 12:07:27 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.20.4.2 2011/11/22 22:47:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,6 @@ static const struct audio_hw_if haltwo_h
haltwo_trigger_output,
haltwo_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
haltwo_get_locks,
};
Index: src/sys/arch/sgimips/mace/mavb.c
diff -u src/sys/arch/sgimips/mace/mavb.c:1.7.4.3 src/sys/arch/sgimips/mace/mavb.c:1.7.4.4
--- src/sys/arch/sgimips/mace/mavb.c:1.7.4.3 Sun Nov 20 18:25:46 2011
+++ src/sys/arch/sgimips/mace/mavb.c Tue Nov 22 22:47:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mavb.c,v 1.7.4.3 2011/11/20 18:25:46 jmcneill Exp $ */
+/* $NetBSD: mavb.c,v 1.7.4.4 2011/11/22 22:47:03 jmcneill Exp $ */
/* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */
/*
@@ -299,7 +299,6 @@ struct audio_hw_if mavb_sa_hw_if = {
mavb_trigger_output,
mavb_trigger_input,
NULL,
- NULL,
mavb_get_locks,
};
Index: src/sys/arch/sparc/dev/audioamd.c
diff -u src/sys/arch/sparc/dev/audioamd.c:1.26.4.2 src/sys/arch/sparc/dev/audioamd.c:1.26.4.3
--- src/sys/arch/sparc/dev/audioamd.c:1.26.4.2 Sun Nov 20 12:04:42 2011
+++ src/sys/arch/sparc/dev/audioamd.c Tue Nov 22 22:47:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: audioamd.c,v 1.26.4.2 2011/11/20 12:04:42 mrg Exp $ */
+/* $NetBSD: audioamd.c,v 1.26.4.3 2011/11/22 22:47:04 jmcneill Exp $ */
/* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.26.4.2 2011/11/20 12:04:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.26.4.3 2011/11/22 22:47:04 jmcneill Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -178,7 +178,6 @@ const struct audio_hw_if sa_hw_if = {
0,
0,
0,
- 0,
audioamd_get_locks,
};
Index: src/sys/arch/x68k/dev/vs.c
diff -u src/sys/arch/x68k/dev/vs.c:1.34.4.1 src/sys/arch/x68k/dev/vs.c:1.34.4.2
--- src/sys/arch/x68k/dev/vs.c:1.34.4.1 Sun Nov 20 16:18:15 2011
+++ src/sys/arch/x68k/dev/vs.c Tue Nov 22 22:47:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vs.c,v 1.34.4.1 2011/11/20 16:18:15 jmcneill Exp $ */
+/* $NetBSD: vs.c,v 1.34.4.2 2011/11/22 22:47:04 jmcneill Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.34.4.1 2011/11/20 16:18:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.34.4.2 2011/11/22 22:47:04 jmcneill Exp $");
#include "audio.h"
#include "vs.h"
@@ -137,7 +137,6 @@ static const struct audio_hw_if vs_hw_if
vs_trigger_output,
vs_trigger_input,
NULL,
- NULL,
vs_get_locks,
};
Index: src/sys/arch/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.15.4.2 src/sys/arch/zaurus/dev/zaudio.c:1.15.4.3
--- src/sys/arch/zaurus/dev/zaudio.c:1.15.4.2 Sun Nov 20 13:47:07 2011
+++ src/sys/arch/zaurus/dev/zaudio.c Tue Nov 22 22:47:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zaudio.c,v 1.15.4.2 2011/11/20 13:47:07 jmcneill Exp $ */
+/* $NetBSD: zaudio.c,v 1.15.4.3 2011/11/22 22:47:04 jmcneill Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/*
@@ -51,7 +51,7 @@
#include "opt_zaudio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.15.4.2 2011/11/20 13:47:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.15.4.3 2011/11/22 22:47:04 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,7 +250,6 @@ struct audio_hw_if wm8750_hw_if = {
.trigger_output = NULL,
.trigger_input = NULL,
.dev_ioctl = NULL,
- .powerstate = NULL,
.get_locks = zaudio_get_locks,
};
Index: src/sys/dev/audio_if.h
diff -u src/sys/dev/audio_if.h:1.66.14.2 src/sys/dev/audio_if.h:1.66.14.3
--- src/sys/dev/audio_if.h:1.66.14.2 Sun Nov 20 09:37:04 2011
+++ src/sys/dev/audio_if.h Tue Nov 22 22:47:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_if.h,v 1.66.14.2 2011/11/20 09:37:04 mrg Exp $ */
+/* $NetBSD: audio_if.h,v 1.66.14.3 2011/11/22 22:47:04 jmcneill Exp $ */
/*
* Copyright (c) 1994 Havard Eidnes.
@@ -240,10 +240,7 @@ struct audio_hw_if {
int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, const audio_params_t *);
int (*dev_ioctl)(void *, u_long, void *, int, struct lwp *);
- int (*powerstate)(void *, int);
void (*get_locks)(void *, kmutex_t **, kmutex_t **);
-#define AUDIOPOWER_ON 1
-#define AUDIOPOWER_OFF 0
};
struct audio_attach_args {
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.24.6.1 src/sys/dev/bluetooth/btsco.c:1.24.6.2
--- src/sys/dev/bluetooth/btsco.c:1.24.6.1 Sat Nov 19 21:49:36 2011
+++ src/sys/dev/bluetooth/btsco.c Tue Nov 22 22:47:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.24.6.1 2011/11/19 21:49:36 jmcneill Exp $ */
+/* $NetBSD: btsco.c,v 1.24.6.2 2011/11/22 22:47:05 jmcneill Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.24.6.1 2011/11/19 21:49:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.24.6.2 2011/11/22 22:47:05 jmcneill Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -196,7 +196,6 @@ static const struct audio_hw_if btsco_if
NULL, /* trigger_output */
NULL, /* trigger_input */
btsco_dev_ioctl, /* dev_ioctl */
- NULL, /* powerstate */
btsco_get_locks, /* get_locks */
};
Index: src/sys/dev/ebus/cs4231_ebus.c
diff -u src/sys/dev/ebus/cs4231_ebus.c:1.34.4.2 src/sys/dev/ebus/cs4231_ebus.c:1.34.4.3
--- src/sys/dev/ebus/cs4231_ebus.c:1.34.4.2 Sun Nov 20 11:41:53 2011
+++ src/sys/dev/ebus/cs4231_ebus.c Tue Nov 22 22:47:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_ebus.c,v 1.34.4.2 2011/11/20 11:41:53 mrg Exp $ */
+/* $NetBSD: cs4231_ebus.c,v 1.34.4.3 2011/11/22 22:47:05 jmcneill Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.34.4.2 2011/11/20 11:41:53 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.34.4.3 2011/11/22 22:47:05 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sparc_arch.h"
@@ -123,7 +123,6 @@ const struct audio_hw_if audiocs_ebus_hw
cs4231_ebus_trigger_output,
cs4231_ebus_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
ad1848_get_locks,
};
Index: src/sys/dev/ic/tms320av110.c
diff -u src/sys/dev/ic/tms320av110.c:1.21.36.1 src/sys/dev/ic/tms320av110.c:1.21.36.2
--- src/sys/dev/ic/tms320av110.c:1.21.36.1 Sun Nov 20 15:48:52 2011
+++ src/sys/dev/ic/tms320av110.c Tue Nov 22 22:47:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110.c,v 1.21.36.1 2011/11/20 15:48:52 jmcneill Exp $ */
+/* $NetBSD: tms320av110.c,v 1.21.36.2 2011/11/22 22:47:05 jmcneill Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.21.36.1 2011/11/20 15:48:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.21.36.2 2011/11/22 22:47:05 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,6 @@ const struct audio_hw_if tav_audio_if =
0, /* trigger_output */
0, /* trigger_input */
0, /* dev_ioctl */ /* optional */
- 0, /* powerhook */ /* optional */
tav_get_locks,
};
Index: src/sys/dev/isa/aria.c
diff -u src/sys/dev/isa/aria.c:1.33.10.1 src/sys/dev/isa/aria.c:1.33.10.2
--- src/sys/dev/isa/aria.c:1.33.10.1 Sat Nov 19 21:49:37 2011
+++ src/sys/dev/isa/aria.c Tue Nov 22 22:47:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aria.c,v 1.33.10.1 2011/11/19 21:49:37 jmcneill Exp $ */
+/* $NetBSD: aria.c,v 1.33.10.2 2011/11/22 22:47:06 jmcneill Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.33.10.1 2011/11/19 21:49:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.33.10.2 2011/11/22 22:47:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,7 +228,6 @@ const struct audio_hw_if aria_hw_if = {
NULL,
NULL,
NULL,
- NULL,
aria_get_locks,
};
Index: src/sys/dev/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.78.10.2 src/sys/dev/isa/ess.c:1.78.10.3
--- src/sys/dev/isa/ess.c:1.78.10.2 Sun Nov 20 08:40:52 2011
+++ src/sys/dev/isa/ess.c Tue Nov 22 22:47:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.78.10.2 2011/11/20 08:40:52 mrg Exp $ */
+/* $NetBSD: ess.c,v 1.78.10.3 2011/11/22 22:47:06 jmcneill Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.78.10.2 2011/11/20 08:40:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.78.10.3 2011/11/22 22:47:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,7 +241,6 @@ const struct audio_hw_if ess_1788_hw_if
ess_audio1_trigger_output,
ess_audio1_trigger_input,
NULL,
- NULL,
ess_get_locks,
};
@@ -273,7 +272,6 @@ const struct audio_hw_if ess_1888_hw_if
ess_audio2_trigger_output,
ess_audio1_trigger_input,
NULL,
- NULL,
ess_get_locks,
};
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.106.4.1 src/sys/dev/isa/gus.c:1.106.4.2
--- src/sys/dev/isa/gus.c:1.106.4.1 Sat Nov 19 21:49:38 2011
+++ src/sys/dev/isa/gus.c Tue Nov 22 22:47:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.106.4.1 2011/11/19 21:49:38 jmcneill Exp $ */
+/* $NetBSD: gus.c,v 1.106.4.2 2011/11/22 22:47:06 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.106.4.1 2011/11/19 21:49:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.106.4.2 2011/11/22 22:47:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -601,7 +601,6 @@ const struct audio_hw_if gus_hw_if = {
NULL,
NULL,
NULL,
- NULL,
ad1848_get_locks,
};
@@ -633,7 +632,6 @@ static const struct audio_hw_if gusmax_h
NULL,
NULL,
NULL,
- NULL,
ad1848_get_locks,
};
Index: src/sys/dev/isa/pas.c
diff -u src/sys/dev/isa/pas.c:1.68.10.1 src/sys/dev/isa/pas.c:1.68.10.2
--- src/sys/dev/isa/pas.c:1.68.10.1 Sat Nov 19 21:49:38 2011
+++ src/sys/dev/isa/pas.c Tue Nov 22 22:47:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.68.10.1 2011/11/19 21:49:38 jmcneill Exp $ */
+/* $NetBSD: pas.c,v 1.68.10.2 2011/11/22 22:47:06 jmcneill Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.68.10.1 2011/11/19 21:49:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.68.10.2 2011/11/22 22:47:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,7 +150,6 @@ const struct audio_hw_if pas_hw_if = {
sbdsp_trigger_output,
sbdsp_trigger_input,
0,
- NULL,
sbdsp_get_locks,
};
Index: src/sys/dev/isa/sb.c
diff -u src/sys/dev/isa/sb.c:1.88.40.1 src/sys/dev/isa/sb.c:1.88.40.2
--- src/sys/dev/isa/sb.c:1.88.40.1 Sat Nov 19 21:49:39 2011
+++ src/sys/dev/isa/sb.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sb.c,v 1.88.40.1 2011/11/19 21:49:39 jmcneill Exp $ */
+/* $NetBSD: sb.c,v 1.88.40.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.88.40.1 2011/11/19 21:49:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.88.40.2 2011/11/22 22:47:07 jmcneill Exp $");
#include "midi.h"
@@ -107,7 +107,6 @@ const struct audio_hw_if sb_hw_if = {
sbdsp_trigger_output,
sbdsp_trigger_input,
NULL,
- NULL,
sbdsp_get_locks,
};
Index: src/sys/dev/isa/wss.c
diff -u src/sys/dev/isa/wss.c:1.69.4.1 src/sys/dev/isa/wss.c:1.69.4.2
--- src/sys/dev/isa/wss.c:1.69.4.1 Sat Nov 19 21:49:39 2011
+++ src/sys/dev/isa/wss.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.69.4.1 2011/11/19 21:49:39 jmcneill Exp $ */
+/* $NetBSD: wss.c,v 1.69.4.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.69.4.1 2011/11/19 21:49:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.69.4.2 2011/11/22 22:47:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,6 @@ const struct audio_hw_if wss_hw_if = {
ad1848_isa_trigger_output,
ad1848_isa_trigger_input,
NULL,
- NULL, /* powerstate */
ad1848_get_locks,
};
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.41.4.1 src/sys/dev/isa/ym.c:1.41.4.2
--- src/sys/dev/isa/ym.c:1.41.4.1 Sat Nov 19 21:49:39 2011
+++ src/sys/dev/isa/ym.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.41.4.1 2011/11/19 21:49:39 jmcneill Exp $ */
+/* $NetBSD: ym.c,v 1.41.4.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*-
* Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.41.4.1 2011/11/19 21:49:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.41.4.2 2011/11/22 22:47:07 jmcneill Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -195,7 +195,6 @@ const struct audio_hw_if ym_hw_if = {
ad1848_isa_trigger_output,
ad1848_isa_trigger_input,
NULL,
- NULL, /* powerstate */
ad1848_get_locks,
};
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.35.14.1 src/sys/dev/isapnp/gus_isapnp.c:1.35.14.2
--- src/sys/dev/isapnp/gus_isapnp.c:1.35.14.1 Sat Nov 19 21:49:39 2011
+++ src/sys/dev/isapnp/gus_isapnp.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.35.14.1 2011/11/19 21:49:39 jmcneill Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.35.14.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.35.14.1 2011/11/19 21:49:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.35.14.2 2011/11/22 22:47:07 jmcneill Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -91,7 +91,6 @@ static const struct audio_hw_if guspnp_h
NULL, /* trigger_output */
NULL, /* trigger_input */
NULL, /* dev_ioctl */
- NULL, /* powerstate */
iw_get_locks,
};
Index: src/sys/dev/pci/auacer.c
diff -u src/sys/dev/pci/auacer.c:1.28.10.1 src/sys/dev/pci/auacer.c:1.28.10.2
--- src/sys/dev/pci/auacer.c:1.28.10.1 Sat Nov 19 21:49:40 2011
+++ src/sys/dev/pci/auacer.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.28.10.1 2011/11/19 21:49:40 jmcneill Exp $ */
+/* $NetBSD: auacer.c,v 1.28.10.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.28.10.1 2011/11/19 21:49:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.28.10.2 2011/11/22 22:47:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,7 +217,6 @@ static struct audio_hw_if auacer_hw_if =
auacer_trigger_output,
auacer_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
auacer_get_locks,
};
Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.138.10.1 src/sys/dev/pci/auich.c:1.138.10.2
--- src/sys/dev/pci/auich.c:1.138.10.1 Sat Nov 19 21:49:40 2011
+++ src/sys/dev/pci/auich.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.138.10.1 2011/11/19 21:49:40 jmcneill Exp $ */
+/* $NetBSD: auich.c,v 1.138.10.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.138.10.1 2011/11/19 21:49:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.138.10.2 2011/11/22 22:47:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -279,7 +279,6 @@ static int auich_trigger_output(void *,
void (*)(void *), void *, const audio_params_t *);
static int auich_trigger_input(void *, void *, void *, int,
void (*)(void *), void *, const audio_params_t *);
-static int auich_powerstate(void *, int);
static void auich_get_locks(void *, kmutex_t **, kmutex_t **);
static int auich_alloc_cdata(struct auich_softc *);
@@ -330,7 +329,6 @@ static const struct audio_hw_if auich_hw
auich_trigger_output,
auich_trigger_input,
NULL, /* dev_ioctl */
- auich_powerstate,
auich_get_locks,
};
@@ -1483,12 +1481,6 @@ auich_trigger_input(void *v, void *start
}
static int
-auich_powerstate(void *v, int state)
-{
- return 0;
-}
-
-static int
auich_allocmem(struct auich_softc *sc, size_t size, size_t align,
struct auich_dma *p)
{
Index: src/sys/dev/pci/auixp.c
diff -u src/sys/dev/pci/auixp.c:1.34.12.1 src/sys/dev/pci/auixp.c:1.34.12.2
--- src/sys/dev/pci/auixp.c:1.34.12.1 Sat Nov 19 21:49:40 2011
+++ src/sys/dev/pci/auixp.c Tue Nov 22 22:47:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.34.12.1 2011/11/19 21:49:40 jmcneill Exp $ */
+/* $NetBSD: auixp.c,v 1.34.12.2 2011/11/22 22:47:07 jmcneill Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <[email protected]>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.34.12.1 2011/11/19 21:49:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.34.12.2 2011/11/22 22:47:07 jmcneill Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -234,7 +234,6 @@ static const struct audio_hw_if auixp_hw
auixp_trigger_output,
auixp_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
auixp_get_locks,
};
Index: src/sys/dev/pci/autri.c
diff -u src/sys/dev/pci/autri.c:1.46.12.1 src/sys/dev/pci/autri.c:1.46.12.2
--- src/sys/dev/pci/autri.c:1.46.12.1 Sat Nov 19 21:49:40 2011
+++ src/sys/dev/pci/autri.c Tue Nov 22 22:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.46.12.1 2011/11/19 21:49:40 jmcneill Exp $ */
+/* $NetBSD: autri.c,v 1.46.12.2 2011/11/22 22:47:08 jmcneill Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.46.12.1 2011/11/19 21:49:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.46.12.2 2011/11/22 22:47:08 jmcneill Exp $");
#include "midi.h"
@@ -163,7 +163,6 @@ static const struct audio_hw_if autri_hw
autri_trigger_output,
autri_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
autri_get_locks,
};
Index: src/sys/dev/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.73.10.1 src/sys/dev/pci/auvia.c:1.73.10.2
--- src/sys/dev/pci/auvia.c:1.73.10.1 Sat Nov 19 21:49:41 2011
+++ src/sys/dev/pci/auvia.c Tue Nov 22 22:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.73.10.1 2011/11/19 21:49:41 jmcneill Exp $ */
+/* $NetBSD: auvia.c,v 1.73.10.2 2011/11/22 22:47:08 jmcneill Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.73.10.1 2011/11/19 21:49:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.73.10.2 2011/11/22 22:47:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,6 @@ static const struct audio_hw_if auvia_hw
auvia_trigger_output,
auvia_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
auvia_get_locks,
};
Index: src/sys/dev/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.77.4.1 src/sys/dev/pci/azalia.c:1.77.4.2
--- src/sys/dev/pci/azalia.c:1.77.4.1 Sat Nov 19 21:49:41 2011
+++ src/sys/dev/pci/azalia.c Tue Nov 22 22:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.77.4.1 2011/11/19 21:49:41 jmcneill Exp $ */
+/* $NetBSD: azalia.c,v 1.77.4.2 2011/11/22 22:47:08 jmcneill Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.77.4.1 2011/11/19 21:49:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.77.4.2 2011/11/22 22:47:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -260,7 +260,6 @@ static const struct audio_hw_if azalia_h
azalia_trigger_output,
azalia_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
azalia_get_locks,
};
Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.42.14.1 src/sys/dev/pci/cmpci.c:1.42.14.2
--- src/sys/dev/pci/cmpci.c:1.42.14.1 Sat Nov 19 21:49:41 2011
+++ src/sys/dev/pci/cmpci.c Tue Nov 22 22:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.42.14.1 2011/11/19 21:49:41 jmcneill Exp $ */
+/* $NetBSD: cmpci.c,v 1.42.14.2 2011/11/22 22:47:08 jmcneill Exp $ */
/*
* Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.42.14.1 2011/11/19 21:49:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.42.14.2 2011/11/22 22:47:08 jmcneill Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -177,7 +177,6 @@ static const struct audio_hw_if cmpci_hw
cmpci_trigger_output, /* trigger_output */
cmpci_trigger_input, /* trigger_input */
NULL, /* dev_ioctl */
- NULL, /* powerstate */
cmpci_get_locks, /* get_locks */
};
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.61.6.1 src/sys/dev/pci/cs4280.c:1.61.6.2
--- src/sys/dev/pci/cs4280.c:1.61.6.1 Sat Nov 19 21:49:42 2011
+++ src/sys/dev/pci/cs4280.c Tue Nov 22 22:47:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.61.6.1 2011/11/19 21:49:42 jmcneill Exp $ */
+/* $NetBSD: cs4280.c,v 1.61.6.2 2011/11/22 22:47:08 jmcneill Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.61.6.1 2011/11/19 21:49:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.61.6.2 2011/11/22 22:47:08 jmcneill Exp $");
#include "midi.h"
@@ -185,7 +185,6 @@ static const struct audio_hw_if cs4280_h
cs4280_trigger_output,
cs4280_trigger_input,
NULL,
- NULL,
cs428x_get_locks,
};
Index: src/sys/dev/pci/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.44.12.1 src/sys/dev/pci/cs4281.c:1.44.12.2
--- src/sys/dev/pci/cs4281.c:1.44.12.1 Sat Nov 19 21:49:42 2011
+++ src/sys/dev/pci/cs4281.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.44.12.1 2011/11/19 21:49:42 jmcneill Exp $ */
+/* $NetBSD: cs4281.c,v 1.44.12.2 2011/11/22 22:47:09 jmcneill Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.44.12.1 2011/11/19 21:49:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.44.12.2 2011/11/22 22:47:09 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,6 @@ static const struct audio_hw_if cs4281_h
cs4281_trigger_output,
cs4281_trigger_input,
NULL,
- NULL,
cs428x_get_locks,
};
Index: src/sys/dev/pci/eap.c
diff -u src/sys/dev/pci/eap.c:1.92.36.1 src/sys/dev/pci/eap.c:1.92.36.2
--- src/sys/dev/pci/eap.c:1.92.36.1 Sat Nov 19 21:49:42 2011
+++ src/sys/dev/pci/eap.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.92.36.1 2011/11/19 21:49:42 jmcneill Exp $ */
+/* $NetBSD: eap.c,v 1.92.36.2 2011/11/22 22:47:09 jmcneill Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.92.36.1 2011/11/19 21:49:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.92.36.2 2011/11/22 22:47:09 jmcneill Exp $");
#include "midi.h"
#include "joy_eap.h"
@@ -186,7 +186,6 @@ static const struct audio_hw_if eap1370_
eap_trigger_output,
eap_trigger_input,
NULL,
- NULL,
eap_get_locks,
};
@@ -218,7 +217,6 @@ static const struct audio_hw_if eap1371_
eap_trigger_output,
eap_trigger_input,
NULL,
- NULL,
eap_get_locks,
};
Index: src/sys/dev/pci/emuxki.c
diff -u src/sys/dev/pci/emuxki.c:1.59.14.3 src/sys/dev/pci/emuxki.c:1.59.14.4
--- src/sys/dev/pci/emuxki.c:1.59.14.3 Mon Nov 21 21:39:44 2011
+++ src/sys/dev/pci/emuxki.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxki.c,v 1.59.14.3 2011/11/21 21:39:44 jakllsch Exp $ */
+/* $NetBSD: emuxki.c,v 1.59.14.4 2011/11/22 22:47:09 jmcneill Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.59.14.3 2011/11/21 21:39:44 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.59.14.4 2011/11/22 22:47:09 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -204,7 +204,6 @@ static const struct audio_hw_if emuxki_h
emuxki_trigger_output,
emuxki_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
emuxki_get_locks,
};
Index: src/sys/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.54.12.1 src/sys/dev/pci/esa.c:1.54.12.2
--- src/sys/dev/pci/esa.c:1.54.12.1 Sat Nov 19 21:49:42 2011
+++ src/sys/dev/pci/esa.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.54.12.1 2011/11/19 21:49:42 jmcneill Exp $ */
+/* $NetBSD: esa.c,v 1.54.12.2 2011/11/22 22:47:09 jmcneill Exp $ */
/*
* Copyright (c) 2001-2008 Jared D. McNeill <[email protected]>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.54.12.1 2011/11/19 21:49:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.54.12.2 2011/11/22 22:47:09 jmcneill Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -223,7 +223,6 @@ static const struct audio_hw_if esa_hw_i
esa_trigger_output,
esa_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
esa_get_locks,
};
Index: src/sys/dev/pci/esm.c
diff -u src/sys/dev/pci/esm.c:1.53.12.1 src/sys/dev/pci/esm.c:1.53.12.2
--- src/sys/dev/pci/esm.c:1.53.12.1 Sat Nov 19 21:49:43 2011
+++ src/sys/dev/pci/esm.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.53.12.1 2011/11/19 21:49:43 jmcneill Exp $ */
+/* $NetBSD: esm.c,v 1.53.12.2 2011/11/22 22:47:09 jmcneill Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.53.12.1 2011/11/19 21:49:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.53.12.2 2011/11/22 22:47:09 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,7 +189,6 @@ const struct audio_hw_if esm_hw_if = {
esm_trigger_output,
esm_trigger_input,
NULL,
- NULL,
esm_get_locks,
};
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.57.14.1 src/sys/dev/pci/eso.c:1.57.14.2
--- src/sys/dev/pci/eso.c:1.57.14.1 Sat Nov 19 21:49:43 2011
+++ src/sys/dev/pci/eso.c Tue Nov 22 22:47:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.57.14.1 2011/11/19 21:49:43 jmcneill Exp $ */
+/* $NetBSD: eso.c,v 1.57.14.2 2011/11/22 22:47:09 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.57.14.1 2011/11/19 21:49:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.57.14.2 2011/11/22 22:47:09 jmcneill Exp $");
#include "mpu.h"
@@ -184,7 +184,6 @@ static const struct audio_hw_if eso_hw_i
eso_trigger_output,
eso_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
eso_get_locks,
};
Index: src/sys/dev/pci/fms.c
diff -u src/sys/dev/pci/fms.c:1.38.10.1 src/sys/dev/pci/fms.c:1.38.10.2
--- src/sys/dev/pci/fms.c:1.38.10.1 Sat Nov 19 21:49:43 2011
+++ src/sys/dev/pci/fms.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.38.10.1 2011/11/19 21:49:43 jmcneill Exp $ */
+/* $NetBSD: fms.c,v 1.38.10.2 2011/11/22 22:47:10 jmcneill Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.38.10.1 2011/11/19 21:49:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.38.10.2 2011/11/22 22:47:10 jmcneill Exp $");
#include "mpu.h"
@@ -137,7 +137,6 @@ static const struct audio_hw_if fms_hw_i
fms_trigger_output,
fms_trigger_input,
NULL,
- NULL,
fms_get_locks,
};
Index: src/sys/dev/pci/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.7.4.3 src/sys/dev/pci/gcscaudio.c:1.7.4.4
--- src/sys/dev/pci/gcscaudio.c:1.7.4.3 Sun Nov 20 11:10:16 2011
+++ src/sys/dev/pci/gcscaudio.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscaudio.c,v 1.7.4.3 2011/11/20 11:10:16 jmcneill Exp $ */
+/* $NetBSD: gcscaudio.c,v 1.7.4.4 2011/11/22 22:47:10 jmcneill Exp $ */
/*-
* Copyright (c) 2008 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.7.4.3 2011/11/20 11:10:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.7.4.4 2011/11/22 22:47:10 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,7 +212,6 @@ static const struct audio_hw_if gcscaudi
.trigger_output = gcscaudio_trigger_output,
.trigger_input = gcscaudio_trigger_input,
.dev_ioctl = NULL,
- .powerstate = NULL,
.get_locks = gcscaudio_get_locks,
};
Index: src/sys/dev/pci/neo.c
diff -u src/sys/dev/pci/neo.c:1.45.12.1 src/sys/dev/pci/neo.c:1.45.12.2
--- src/sys/dev/pci/neo.c:1.45.12.1 Sat Nov 19 21:49:44 2011
+++ src/sys/dev/pci/neo.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.45.12.1 2011/11/19 21:49:44 jmcneill Exp $ */
+/* $NetBSD: neo.c,v 1.45.12.2 2011/11/22 22:47:10 jmcneill Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.45.12.1 2011/11/19 21:49:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.45.12.2 2011/11/22 22:47:10 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -270,7 +270,6 @@ static const struct audio_hw_if neo_hw_i
neo_trigger_output,
neo_trigger_input,
NULL,
- NULL,
neo_get_locks,
};
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.44.14.1 src/sys/dev/pci/sv.c:1.44.14.2
--- src/sys/dev/pci/sv.c:1.44.14.1 Sat Nov 19 21:49:44 2011
+++ src/sys/dev/pci/sv.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.44.14.1 2011/11/19 21:49:44 jmcneill Exp $ */
+/* $NetBSD: sv.c,v 1.44.14.2 2011/11/22 22:47:10 jmcneill Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.44.14.1 2011/11/19 21:49:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.44.14.2 2011/11/22 22:47:10 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -198,7 +198,6 @@ static const struct audio_hw_if sv_hw_if
sv_trigger_output,
sv_trigger_input,
NULL,
- NULL,
sv_get_locks,
};
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.50.10.1 src/sys/dev/pci/yds.c:1.50.10.2
--- src/sys/dev/pci/yds.c:1.50.10.1 Sat Nov 19 21:49:44 2011
+++ src/sys/dev/pci/yds.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.50.10.1 2011/11/19 21:49:44 jmcneill Exp $ */
+/* $NetBSD: yds.c,v 1.50.10.2 2011/11/22 22:47:10 jmcneill Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.50.10.1 2011/11/19 21:49:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.50.10.2 2011/11/22 22:47:10 jmcneill Exp $");
#include "mpu.h"
@@ -230,7 +230,6 @@ static const struct audio_hw_if yds_hw_i
yds_trigger_output,
yds_trigger_input,
NULL,
- NULL, /* powerstate */
yds_get_locks,
};
Index: src/sys/dev/sbus/cs4231_sbus.c
diff -u src/sys/dev/sbus/cs4231_sbus.c:1.48.4.3 src/sys/dev/sbus/cs4231_sbus.c:1.48.4.4
--- src/sys/dev/sbus/cs4231_sbus.c:1.48.4.3 Tue Nov 22 17:36:01 2011
+++ src/sys/dev/sbus/cs4231_sbus.c Tue Nov 22 22:47:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.48.4.3 2011/11/22 17:36:01 macallan Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.48.4.4 2011/11/22 22:47:10 jmcneill Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.48.4.3 2011/11/22 17:36:01 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.48.4.4 2011/11/22 22:47:10 jmcneill Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -124,7 +124,6 @@ const struct audio_hw_if audiocs_sbus_hw
cs4231_sbus_trigger_output,
cs4231_sbus_trigger_input,
NULL, /* dev_ioctl */
- NULL, /* powerstate */
ad1848_get_locks,
};
Index: src/sys/dev/tc/bba.c
diff -u src/sys/dev/tc/bba.c:1.38.4.1 src/sys/dev/tc/bba.c:1.38.4.2
--- src/sys/dev/tc/bba.c:1.38.4.1 Sun Nov 20 10:56:19 2011
+++ src/sys/dev/tc/bba.c Tue Nov 22 22:47:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bba.c,v 1.38.4.1 2011/11/20 10:56:19 mrg Exp $ */
+/* $NetBSD: bba.c,v 1.38.4.2 2011/11/22 22:47:11 jmcneill Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
/* maxine/alpha baseboard audio (bba) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.38.4.1 2011/11/20 10:56:19 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.38.4.2 2011/11/22 22:47:11 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,7 +178,6 @@ static const struct audio_hw_if sa_hw_if
bba_trigger_output, /* md */
bba_trigger_input, /* md */
0,
- 0,
bba_get_locks,
};
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.120.10.1 src/sys/dev/usb/uaudio.c:1.120.10.2
--- src/sys/dev/usb/uaudio.c:1.120.10.1 Tue Nov 22 02:39:59 2011
+++ src/sys/dev/usb/uaudio.c Tue Nov 22 22:47:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.120.10.1 2011/11/22 02:39:59 mrg Exp $ */
+/* $NetBSD: uaudio.c,v 1.120.10.2 2011/11/22 22:47:11 jmcneill Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.120.10.1 2011/11/22 02:39:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.120.10.2 2011/11/22 22:47:11 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -362,7 +362,6 @@ Static const struct audio_hw_if uaudio_h
uaudio_trigger_output,
uaudio_trigger_input,
NULL,
- NULL,
uaudio_get_locks,
};
