Remove unused getdev() audio driver functions.

36 files changed, 39 insertions, 617 deletions

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 920889e6ad9..d3a5892d523 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.152 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: audio.c,v 1.153 2016/09/19 06:46:43 ratchov Exp $	*/
 /*
  * Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org>
  *
@@ -1023,7 +1023,6 @@ audio_attach(struct device *parent, struct device *self, void *aux)
 	    (ops->start_input == 0 && ops->trigger_input == 0) ||
 	    ops->halt_output == 0 ||
 	    ops->halt_input == 0 ||
-	    ops->getdev == 0 ||
 	    ops->set_port == 0 ||
 	    ops->get_port == 0 ||
 	    ops->query_devinfo == 0 ||
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index dab2389e15f..bdef371a81c 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio_if.h,v 1.32 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: audio_if.h,v 1.33 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
  * Generic interface to hardware driver.
  */
 
-struct audio_device;
 struct mixer_devinfo;
 struct mixer_ctrl;
 
@@ -113,7 +112,6 @@ struct audio_hw_if {
 #define SPKR_ON		1
 #define SPKR_OFF	0
 
-	int	(*getdev)(void *, struct audio_device *);
 	int	(*setfd)(void *, int);
 
 	/* Mixer (in/out ports) */
diff --git a/sys/dev/ic/am7930var.h b/sys/dev/ic/am7930var.h
index 8ce7e9d1894..2b8d8d02552 100644
--- a/sys/dev/ic/am7930var.h
+++ b/sys/dev/ic/am7930var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7930var.h,v 1.4 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: am7930var.h,v 1.5 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: am7930var.h,v 1.10 2005/01/15 15:19:52 kent Exp $	*/
 
 /*
@@ -102,7 +102,6 @@ void	am7930_init(struct am7930_softc *, int);
  * audio(9) MI callbacks from upper-level audio layer.
  */
 
-struct audio_device;
 struct audio_params;
 
 int	am7930_open(void *, int);
@@ -113,7 +112,6 @@ int	am7930_commit_settings(void *);
 int	am7930_round_blocksize(void *, int);
 int	am7930_halt_output(void *);
 int	am7930_halt_input(void *);
-int	am7930_getdev(void *, struct audio_device *);
 int	am7930_get_props(void *);
 int	am7930_set_port(void *, mixer_ctrl_t *);
 int	am7930_get_port(void *, mixer_ctrl_t *);
diff --git a/sys/dev/ic/arcofi.c b/sys/dev/ic/arcofi.c
index b93181e36ef..a5c11c6b649 100644
--- a/sys/dev/ic/arcofi.c
+++ b/sys/dev/ic/arcofi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcofi.c,v 1.15 2016/09/17 07:29:04 ratchov Exp $	*/
+/*	$OpenBSD: arcofi.c,v 1.16 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2011 Miodrag Vallat.
@@ -195,7 +195,6 @@ int	arcofi_set_param(struct arcofi_softc *, int, int, int,
 
 void	arcofi_close(void *);
 int	arcofi_commit_settings(void *);
-int	arcofi_getdev(void *, struct audio_device *);
 int	arcofi_get_port(void *, mixer_ctrl_t *);
 int	arcofi_get_props(void *);
 int	arcofi_halt_input(void *);
@@ -545,15 +544,6 @@ arcofi_halt_output(void *v)
 	return 0;
 }
 
-int
-arcofi_getdev(void *v, struct audio_device *ad)
-{
-	struct arcofi_softc *sc = (struct arcofi_softc *)v;
-
-	bcopy(&sc->sc_audio_device, ad, sizeof(*ad));
-	return 0;
-}
-
 /*
  * Convert gain table index to AUDIO_MIN_GAIN..AUDIO_MAX_GAIN scale.
  */
@@ -1136,13 +1126,6 @@ arcofi_attach(struct arcofi_softc *sc, const char *version)
 	arcofi_write(sc, ARCOFI_FIFO_IR, 0);
 	arcofi_write(sc, ARCOFI_CSR, CSR_INTR_ENABLE);
 
-	strlcpy(sc->sc_audio_device.name, arcofi_cd.cd_name,
-	    sizeof(sc->sc_audio_device.name));
-	strlcpy(sc->sc_audio_device.version, version,
-	    sizeof(sc->sc_audio_device.version));
-	strlcpy(sc->sc_audio_device.config, sc->sc_dev.dv_xname,
-	    sizeof(sc->sc_audio_device.config));
-
 	audio_attach_mi(&arcofi_hw_if, sc, &sc->sc_dev);
 	return;
 
diff --git a/sys/dev/ic/arcofivar.h b/sys/dev/ic/arcofivar.h
index 3f882e3367c..b77594c9821 100644
--- a/sys/dev/ic/arcofivar.h
+++ b/sys/dev/ic/arcofivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcofivar.h,v 1.2 2011/12/25 00:07:27 miod Exp $	*/
+/*	$OpenBSD: arcofivar.h,v 1.3 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2011 Miodrag Vallat.
@@ -24,7 +24,6 @@ struct arcofi_softc {
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 
-	struct audio_device	sc_audio_device;
 	void			*sc_sih;
 
 	int			sc_open;
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index ded28774eaa..3dbdf2f00b3 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ess.c,v 1.23 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: ess.c,v 1.24 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $	*/
 
 /*
@@ -118,7 +118,6 @@ int	ess_setup_sc(struct ess_softc *, int);
 int	ess_open(void *, int);
 void	ess_1788_close(void *);
 void	ess_1888_close(void *);
-int	ess_getdev(void *, struct audio_device *);
 
 int	ess_set_params(void *, int, int, struct audio_params *,
 	    struct audio_params *);
@@ -140,8 +139,6 @@ void	ess_audio2_poll(void *);
 
 int	ess_speaker_ctl(void *, int);
 
-int	ess_getdev(void *, struct audio_device *);
-
 int	ess_set_port(void *, mixer_ctrl_t *);
 int	ess_get_port(void *, mixer_ctrl_t *);
 
@@ -196,12 +193,6 @@ static char *essmodel[] = {
 	"1878",
 };
 
-struct audio_device ess_device = {
-	"ESS Technology",
-	"x",
-	"ess"
-};
-
 /*
  * Define our interface to the higher level audio driver.
  */
@@ -219,7 +210,6 @@ struct audio_hw_if ess_1788_hw_if = {
 	ess_audio1_halt,
 	ess_audio1_halt,
 	ess_speaker_ctl,
-	ess_getdev,
 	NULL,
 	ess_set_port,
 	ess_get_port,
@@ -245,7 +235,6 @@ struct audio_hw_if ess_1888_hw_if = {
 	ess_audio2_halt,
 	ess_audio1_halt,
 	ess_speaker_ctl,
-	ess_getdev,
 	NULL,
 	ess_set_port,
 	ess_get_port,
@@ -985,11 +974,6 @@ essattach(struct ess_softc *sc)
 	ess_speaker_off(sc);
 	sc->spkr_state = SPKR_OFF;
 
-	snprintf(ess_device.name, sizeof ess_device.name, "ES%s",
-	    essmodel[sc->sc_model]);
-	snprintf(ess_device.version, sizeof ess_device.version, "0x%04x",
-	    sc->sc_version);
-
 	if (ESS_USE_AUDIO1(sc->sc_model))
 		audio_attach_mi(&ess_1788_hw_if, sc, &sc->sc_dev);
 	else
@@ -1080,13 +1064,6 @@ ess_speaker_ctl(void *addr, int newstate)
 }
 
 int
-ess_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = ess_device;
-	return (0);
-}
-
-int
 ess_set_params(void *addr, int setmode, int usemode,
     struct audio_params *play, struct audio_params *rec)
 {
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index a3741beb31e..909c2103100 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus.c,v 1.44 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: gus.c,v 1.45 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -278,7 +278,6 @@ struct audio_hw_if gus_hw_if = {
 	gus_halt_in_dma,
 	gus_speaker_ctl,
 
-	gus_getdev,
 	NULL,
 	gus_mixer_set_port,
 	gus_mixer_get_port,
@@ -311,7 +310,6 @@ static struct audio_hw_if gusmax_hw_if = {
 
 	gusmax_speaker_ctl,
 
-	gus_getdev,
 	NULL,
 	gusmax_mixer_set_port,
 	gusmax_mixer_get_port,
@@ -325,16 +323,6 @@ static struct audio_hw_if gusmax_hw_if = {
 	NULL
 };
 
-/*
- * Some info about the current audio device
- */
-struct audio_device gus_device = {
-	"UltraSound",
-	"",
-	"gus",
-};
-
-
 int
 gusopen(void *addr, int flags)
 {
@@ -2111,18 +2099,6 @@ gus_init_cs4231(struct gus_softc *sc)
 	}
 }
 
-
-/*
- * Return info about the audio device, for the AUDIO_GETINFO ioctl
- */
-
-int
-gus_getdev(void *addr, struct audio_device *dev)
-{
-	*dev = gus_device;
-	return 0;
-}
-
 /*
  * stubs (XXX)
  */
@@ -3363,9 +3339,6 @@ gus_subattach(struct gus_softc *sc, struct isa_attach_args *ia)
 	 * of the board version. Simply use the revision register as
 	 * identification.
 	 */
-	snprintf(gus_device.version, sizeof gus_device.version, "%d",
-	    sc->sc_revision);
-
 	printf(": ver %d", sc->sc_revision);
 	if (sc->sc_revision >= 10)
 		printf(", MAX");
diff --git a/sys/dev/isa/gusvar.h b/sys/dev/isa/gusvar.h
index 2608925295d..4422948542b 100644
--- a/sys/dev/isa/gusvar.h
+++ b/sys/dev/isa/gusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gusvar.h,v 1.9 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: gusvar.h,v 1.10 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -329,7 +329,6 @@ int	gusmax_dma_input(void *, void *, int, void (*)(void *), void *);
 int	gusmax_halt_out_dma(void *);
 int	gusmax_halt_in_dma(void *);
 int	gusmax_speaker_ctl(void *, int);
-int	gus_getdev(void *, struct audio_device *);
 
 void	gus_deinterleave(struct gus_softc *, void *, int);
 
@@ -408,7 +407,6 @@ extern const int gus_addrs;
 #define splgus splaudio
 
 extern struct audio_hw_if gus_hw_if;
-extern struct audio_device gus_device;
 
 #define FLIP_REV	5		/* This rev has flipped mixer chans */
 
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index f7700e262e9..450f3405bfe 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pas.c,v 1.28 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: pas.c,v 1.29 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $	*/
 
 /*
@@ -101,7 +101,6 @@ struct pas_softc {
 
 };
 
-int	pas_getdev(void *, struct audio_device *);
 void	pasconf(int, int, int, int);
 
 
@@ -122,7 +121,6 @@ struct audio_hw_if pas_hw_if = {
 	sbdsp_haltdma,
 	sbdsp_haltdma,
 	sbdsp_speaker_ctl,
-	pas_getdev,
 	0,
 	sbdsp_mixer_set_port,
 	sbdsp_mixer_get_port,
@@ -146,12 +144,6 @@ static char *pasnames[] = {
 	"16Basic"
 };
 
-static struct audio_device pas_device = {
-	"PAS,??",
-	"",
-	"pas"
-};
-
 /*XXX assume default I/O base address */
 #define pasread(p) inb(p)
 #define paswrite(d, p) outb(p, d)
@@ -414,19 +406,5 @@ pasattach(parent, self, aux)
 	
 	sbdsp_attach(&sc->sc_sbdsp);
 
-	snprintf(pas_device.name, sizeof pas_device.name, "pas,%s",
-	    pasnames[sc->model]);
-	snprintf(pas_device.version, sizeof pas_device.version, "%d",
-	    sc->rev);
-
 	audio_attach_mi(&pas_hw_if, &sc->sc_sbdsp, &sc->sc_sbdsp.sc_dev);
 }
-
-int
-pas_getdev(addr, retp)
-	void *addr;
-	struct audio_device *retp;
-{
-	*retp = pas_device;
-	return 0;
-}
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 13aaa5d6921..4bc83442e54 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb.c,v 1.28 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: sb.c,v 1.29 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $	*/
 
 /*
@@ -89,14 +89,6 @@ struct midi_hw_if sb_mpu401_hw_if = {
 };
 #endif
 
-struct audio_device sb_device = {
-	"SoundBlaster",
-	"x",
-	"sb"
-};
-
-int	sb_getdev(void *, struct audio_device *);
-
 /*
  * Define our interface to the higher level audio driver.
  */
@@ -114,7 +106,6 @@ struct audio_hw_if sb_hw_if = {
 	sbdsp_haltdma,
 	sbdsp_haltdma,
 	sbdsp_speaker_ctl,
-	sb_getdev,
 	0,
 	sbdsp_mixer_set_port,
 	sbdsp_mixer_get_port,
@@ -287,31 +278,6 @@ sbattach(sc)
  * Various routines to interface to higher level audio driver
  */
 
-int
-sb_getdev(addr, retp)
-	void *addr;
-	struct audio_device *retp;
-{
-	struct sbdsp_softc *sc = addr;
-	static char *names[] = SB_NAMES;
-	char *config;
-
-	if (sc->sc_model == SB_JAZZ)
-		strlcpy(retp->name, "MV Jazz16", sizeof retp->name);
-	else
-		strlcpy(retp->name, "SoundBlaster", sizeof retp->name);
-	snprintf(retp->version, sizeof retp->version, "%d.%02d", 
-		 SBVER_MAJOR(sc->sc_version),
-		 SBVER_MINOR(sc->sc_version));
-	if (0 <= sc->sc_model && sc->sc_model < sizeof names / sizeof names[0])
-		config = names[sc->sc_model];
-	else
-		config = "??";
-	strlcpy(retp->config, config, sizeof retp->config);
-		
-	return 0;
-}
-
 #if NMIDI > 0
 
 #define SBMPU(a) (&((struct sbdsp_softc *)addr)->sc_mpu_sc)
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index 8b26b2511b9..ff72fc58462 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auacer.c,v 1.19 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: auacer.c,v 1.20 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $	*/
 
 /*-
@@ -91,8 +91,6 @@ struct auacer_softc {
 	struct device sc_dev;
 	void *sc_ih;
 
-	audio_device_t sc_audev;
-
 	bus_space_tag_t iot;
 	bus_space_handle_t mix_ioh;
 	bus_space_handle_t aud_ioh;
@@ -158,7 +156,6 @@ int	auacer_set_params(void *, int, int, struct audio_params *,
 int	auacer_round_blocksize(void *, int);
 int	auacer_halt_output(void *);
 int	auacer_halt_input(void *);
-int	auacer_getdev(void *, struct audio_device *);
 int	auacer_set_port(void *, mixer_ctrl_t *);
 int	auacer_get_port(void *, mixer_ctrl_t *);
 int	auacer_query_devinfo(void *, mixer_devinfo_t *);
@@ -195,7 +192,6 @@ struct audio_hw_if auacer_hw_if = {
 	auacer_halt_output,
 	auacer_halt_input,
 	NULL,			/* speaker_ctl */
-	auacer_getdev,
 	NULL,			/* getfd */
 	auacer_set_port,
 	auacer_get_port,
@@ -258,11 +254,6 @@ auacer_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 
-	strlcpy(sc->sc_audev.name, "M5455 AC97", MAX_AUDIO_DEV_LEN);
-	snprintf(sc->sc_audev.version, MAX_AUDIO_DEV_LEN,
-		 "0x%02x", PCI_REVISION(pa->pa_class));
-	strlcpy(sc->sc_audev.config, sc->sc_dev.dv_xname, MAX_AUDIO_DEV_LEN);
-
 	printf(": %s\n", intrstr);
 
 	/* Set up DMA lists. */
@@ -570,16 +561,6 @@ auacer_halt_input(void *v)
 }
 
 int
-auacer_getdev(void *v, struct audio_device *adp)
-{
-	struct auacer_softc *sc = v;
-
-	DPRINTF(ALI_DEBUG_API, ("auacer_getdev\n"));
-	*adp = sc->sc_audev;
-	return (0);
-}
-
-int
 auacer_set_port(void *v, mixer_ctrl_t *cp)
 {
 	struct auacer_softc *sc = v;
diff --git a/sys/dev/pci/auglx.c b/sys/dev/pci/auglx.c
index a01a2a5bd57..166a9530a74 100644
--- a/sys/dev/pci/auglx.c
+++ b/sys/dev/pci/auglx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: auglx.c,v 1.14 2016/09/14 06:12:19 ratchov Exp $	*/
+/*      $OpenBSD: auglx.c,v 1.15 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -166,8 +166,6 @@ struct auglx_softc {
 	struct device		 sc_dev;
 	void			*sc_ih;
 
-	audio_device_t		 sc_audev;
-
 	bus_space_tag_t		 sc_iot;
 	bus_space_handle_t	 sc_ioh;
 	bus_dma_tag_t		 sc_dmat;
@@ -219,7 +217,6 @@ int auglx_set_params(void *, int, int, struct audio_params *,
 int auglx_round_blocksize(void *, int);
 int auglx_halt_output(void *);
 int auglx_halt_input(void *);
-int auglx_getdev(void *, struct audio_device *);
 int auglx_set_port(void *, mixer_ctrl_t *);
 int auglx_get_port(void *, mixer_ctrl_t *);
 int auglx_query_devinfo(void *, mixer_devinfo_t *);
@@ -250,7 +247,6 @@ struct audio_hw_if auglx_hw_if = {
 	auglx_halt_output,
 	auglx_halt_input,
 	NULL,			/* speaker_ctl */
-	auglx_getdev,
 	NULL,			/* getfd */
 	auglx_set_port,
 	auglx_get_port,
@@ -325,13 +321,7 @@ auglx_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 
-	strlcpy(sc->sc_audev.name, "CS5536 AC97", sizeof sc->sc_audev.name);
-	snprintf(sc->sc_audev.version, sizeof sc->sc_audev.version, "0x%02x",
-		 PCI_REVISION(pa->pa_class));
-	strlcpy(sc->sc_audev.config, sc->sc_dev.dv_xname,
-		sizeof sc->sc_audev.config);
-
-	printf(": %s, %s\n", intrstr, sc->sc_audev.name);
+	printf(": %s, %s\n", intrstr, "CS5536 AC97");
 
 	sc->host_if.arg = sc;
 	sc->host_if.attach = auglx_attach_codec;
@@ -553,14 +543,6 @@ auglx_halt_input(void *v)
 }
 
 int
-auglx_getdev(void *v, struct audio_device *adp)
-{
-	struct auglx_softc *sc = v;
-	*adp = sc->sc_audev;
-	return 0;
-}
-
-int
 auglx_set_port(void *v, mixer_ctrl_t *cp)
 {
 	struct auglx_softc *sc = v;
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 0c56fb66c4b..498615e53bd 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.105 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: auich.c,v 1.106 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -170,8 +170,6 @@ struct auich_softc {
 	struct device sc_dev;
 	void *sc_ih;
 
-	audio_device_t sc_audev;
-
 	pcireg_t pci_id;
 	bus_space_tag_t iot;
 	bus_space_tag_t iot_mix;
@@ -298,7 +296,6 @@ int auich_round_blocksize(void *, int);
 void auich_halt_pipe(struct auich_softc *, int, struct auich_ring *);
 int auich_halt_output(void *);
 int auich_halt_input(void *);
-int auich_getdev(void *, struct audio_device *);
 int auich_set_port(void *, mixer_ctrl_t *);
 int auich_get_port(void *, mixer_ctrl_t *);
 int auich_query_devinfo(void *, mixer_devinfo_t *);
@@ -331,7 +328,6 @@ struct audio_hw_if auich_hw_if = {
 	auich_halt_output,
 	auich_halt_input,
 	NULL,			/* speaker_ctl */
-	auich_getdev,
 	NULL,			/* getfd */
 	auich_set_port,
 	auich_get_port,
@@ -451,14 +447,7 @@ auich_attach(struct device *parent, struct device *self, void *aux)
 		if (PCI_PRODUCT(pa->pa_id) == auich_devices[i].product)
 			break;
 
-	snprintf(sc->sc_audev.name, sizeof sc->sc_audev.name, "%s AC97",
-		 auich_devices[i].name);
-	snprintf(sc->sc_audev.version, sizeof sc->sc_audev.version, "0x%02x",
-		 PCI_REVISION(pa->pa_class));
-	strlcpy(sc->sc_audev.config, sc->sc_dev.dv_xname,
-		sizeof sc->sc_audev.config);
-
-	printf(": %s, %s\n", intrstr, sc->sc_audev.name);
+	printf(": %s, %s\n", intrstr, auich_devices[i].name);
 
 	/* SiS 7012 needs special handling */
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SIS &&
@@ -855,14 +844,6 @@ auich_halt_input(void *v)
 }
 
 int
-auich_getdev(void *v, struct audio_device *adp)
-{
-	struct auich_softc *sc = v;
-	*adp = sc->sc_audev;
-	return 0;
-}
-
-int
 auich_set_port(void *v, mixer_ctrl_t *cp)
 {
 	struct auich_softc *sc = v;
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 8177737b680..a45aa7f8144 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.37 2016/09/14 06:12:19 ratchov Exp $ */
+/* $OpenBSD: auixp.c,v 1.38 2016/09/19 06:46:44 ratchov Exp $ */
 /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
 
 /*
@@ -125,7 +125,6 @@ int	auixp_get_port(void *, mixer_ctrl_t *);
 int	auixp_query_devinfo(void *, mixer_devinfo_t *);
 void *	auixp_malloc(void *, int, size_t, int, int);
 void	auixp_free(void *, void *, int);
-int	auixp_getdev(void *, struct audio_device *);
 size_t	auixp_round_buffersize(void *, int, size_t);
 int	auixp_get_props(void *);
 int	auixp_intr(void *);
@@ -177,7 +176,6 @@ struct audio_hw_if auixp_hw_if = {
 	auixp_halt_output,
 	auixp_halt_input,
 	NULL,			/* speaker_ctl */
-	auixp_getdev,
 	NULL,			/* getfd */
 	auixp_set_port,
 	auixp_get_port,
@@ -425,14 +423,6 @@ auixp_free(void *hdl, void *addr, int pool)
 	}
 }
 
-int
-auixp_getdev(void *v, struct audio_device *adp)
-{
-	struct auixp_softc *sc = v;
-	*adp = sc->sc_audev;
-	return 0;
-}
-
 /* pass request to AC'97 codec code */
 int
 auixp_set_port(void *hdl, mixer_ctrl_t *mc)
@@ -1031,12 +1021,6 @@ auixp_attach(struct device *parent, struct device *self, void *aux)
 	}
 	printf(": %s\n", intrstr);
 
-	strlcpy(sc->sc_audev.name, "ATI IXP AC97", sizeof sc->sc_audev.name);
-	snprintf(sc->sc_audev.version, sizeof sc->sc_audev.version, "0x%02x",
-	    PCI_REVISION(pa->pa_class));
-	strlcpy(sc->sc_audev.config, sc->sc_dev.dv_xname,
-	    sizeof sc->sc_audev.config);
-
 	/* power up chip */
 	pci_set_powerstate(pc, tag, PCI_PMCSR_STATE_D0);
 
diff --git a/sys/dev/pci/auixpvar.h b/sys/dev/pci/auixpvar.h
index 89cc316b85f..00999101bfb 100644
--- a/sys/dev/pci/auixpvar.h
+++ b/sys/dev/pci/auixpvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixpvar.h,v 1.3 2010/09/21 02:09:15 jakemsr Exp $ */
+/* $OpenBSD: auixpvar.h,v 1.4 2016/09/19 06:46:44 ratchov Exp $ */
 /* $NetBSD: auixpvar.h,v 1.3 2005/01/12 15:54:34 kent Exp $*/
 
 /*
@@ -82,7 +82,6 @@ struct auixp_codec {
 
 struct auixp_softc {
 	struct device		sc_dev;
-	audio_device_t		sc_audev;
 	void			*sc_ih;
 
 	/* card properties */
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 715f920e1f6..3ae587c7c31 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autri.c,v 1.40 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: autri.c,v 1.41 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -130,7 +130,6 @@ int	autri_trigger_input(void *, void *, void *, int, void (*)(void *),
 	    void *, struct audio_params *);
 int	autri_halt_output(void *);
 int	autri_halt_input(void *);
-int	autri_getdev(void *, struct audio_device *);
 int	autri_mixer_set_port(void *, mixer_ctrl_t *);
 int	autri_mixer_get_port(void *, mixer_ctrl_t *);
 void   *autri_malloc(void *, int, size_t, int, int);
@@ -153,7 +152,6 @@ struct audio_hw_if autri_hw_if = {
 	autri_halt_output,
 	autri_halt_input,
 	NULL,			/* speaker_ctl */
-	autri_getdev,
 	NULL,			/* setfd */
 	autri_mixer_set_port,
 	autri_mixer_get_port,
@@ -954,37 +952,6 @@ autri_halt_input(void *addr)
 }
 
 int
-autri_getdev(void *addr, struct audio_device *retp)
-{
-	struct autri_softc *sc = addr;
-
-	DPRINTF(("autri_getdev().\n"));
-
-	strncpy(retp->name, "Trident 4DWAVE", sizeof(retp->name));
-	snprintf(retp->version, sizeof(retp->version), "0x%02x",
-	    PCI_REVISION(sc->sc_class));
-
-	switch (sc->sc_devid) {
-	case AUTRI_DEVICE_ID_4DWAVE_DX:
-		strncpy(retp->config, "4DWAVE-DX", sizeof(retp->config));
-		break;
-	case AUTRI_DEVICE_ID_4DWAVE_NX:
-		strncpy(retp->config, "4DWAVE-NX", sizeof(retp->config));
-		break;
-	case AUTRI_DEVICE_ID_SIS_7018:
-		strncpy(retp->config, "SiS 7018", sizeof(retp->config));
-		break;
-	case AUTRI_DEVICE_ID_ALI_M5451:
-		strncpy(retp->config, "ALi M5451", sizeof(retp->config));
-		break;
-	default:
-		strncpy(retp->config, "unknown", sizeof(retp->config));
-	}
-
-	return 0;
-}
-
-int
 autri_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct autri_softc *sc = addr;
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 5dae0bc4854..6183eb05f07 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auvia.c,v 1.56 2016/09/14 06:12:19 ratchov Exp $ */
+/*	$OpenBSD: auvia.c,v 1.57 2016/09/19 06:46:44 ratchov Exp $ */
 /*	$NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $	*/
 
 /*-
@@ -81,7 +81,6 @@ int	auvia_set_params(void *, int, int, struct audio_params *,
 int	auvia_round_blocksize(void *, int);
 int	auvia_halt_output(void *);
 int	auvia_halt_input(void *);
-int	auvia_getdev(void *, struct audio_device *);
 int	auvia_set_port(void *, mixer_ctrl_t *);
 int	auvia_get_port(void *, mixer_ctrl_t *);
 int	auvia_query_devinfo(void *, mixer_devinfo_t *);
@@ -192,7 +191,6 @@ struct audio_hw_if auvia_hw_if = {
 	auvia_halt_output,
 	auvia_halt_input,
 	NULL, /* speaker_ctl */
-	auvia_getdev,
 	NULL, /* setfd */
 	auvia_set_port,
 	auvia_get_port,
@@ -694,23 +692,6 @@ auvia_halt_input(void *addr)
 
 
 int
-auvia_getdev(void *addr, struct audio_device *retp)
-{
-	struct auvia_softc *sc = addr;
-
-	if (retp) {
-		strncpy(retp->name,
-		    sc->sc_flags & AUVIA_FLAGS_VT8233? "VIA VT8233" :
-		    "VIA VT82C686A", sizeof(retp->name));
-		strncpy(retp->version, sc->sc_revision, sizeof(retp->version));
-		strncpy(retp->config, "auvia", sizeof(retp->config));
-	}
-
-	return 0;
-}
-
-
-int
 auvia_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct auvia_softc *sc = addr;
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index f909787b797..57ee558e308 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.228 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.229 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -254,7 +254,6 @@ int	azalia_set_params(void *, int, int, audio_params_t *,
 int	azalia_round_blocksize(void *, int);
 int	azalia_halt_output(void *);
 int	azalia_halt_input(void *);
-int	azalia_getdev(void *, struct audio_device *);
 int	azalia_set_port(void *, mixer_ctrl_t *);
 int	azalia_get_port(void *, mixer_ctrl_t *);
 int	azalia_query_devinfo(void *, mixer_devinfo_t *);
@@ -302,7 +301,6 @@ struct audio_hw_if azalia_hw_if = {
 	azalia_halt_output,
 	azalia_halt_input,
 	NULL,			/* speaker_ctl */
-	azalia_getdev,
 	NULL,			/* setfd */
 	azalia_set_port,
 	azalia_get_port,
@@ -4038,19 +4036,6 @@ azalia_halt_input(void *v)
 }
 
 int
-azalia_getdev(void *v, struct audio_device *dev)
-{
-	azalia_t *az;
-
-	az = v;
-	strlcpy(dev->name, "HD-Audio", MAX_AUDIO_DEV_LEN);
-	snprintf(dev->version, MAX_AUDIO_DEV_LEN,
-	    "%d.%d", AZ_READ_1(az, VMAJ), AZ_READ_1(az, VMIN));
-	strlcpy(dev->config, XNAME(az), MAX_AUDIO_DEV_LEN);
-	return 0;
-}
-
-int
 azalia_set_port(void *v, mixer_ctrl_t *mc)
 {
 	azalia_t *az;
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index c22a257136a..9ef3939823f 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmpci.c,v 1.41 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: cmpci.c,v 1.42 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $	*/
 
 /*
@@ -135,7 +135,6 @@ int cmpci_set_params(void *, int, int,
 int cmpci_round_blocksize(void *, int);
 int cmpci_halt_output(void *);
 int cmpci_halt_input(void *);
-int cmpci_getdev(void *, struct audio_device *);
 int cmpci_set_port(void *, mixer_ctrl_t *);
 int cmpci_get_port(void *, mixer_ctrl_t *);
 int cmpci_query_devinfo(void *, mixer_devinfo_t *);
@@ -163,7 +162,6 @@ struct audio_hw_if cmpci_hw_if = {
 	cmpci_halt_output,	/* halt_output */
 	cmpci_halt_input,	/* halt_input */
 	NULL,			/* speaker_ctl */
-	cmpci_getdev,		/* getdev */
 	NULL,			/* setfd */
 	cmpci_set_port,		/* set_port */
 	cmpci_get_port,		/* get_port */
@@ -874,35 +872,6 @@ cmpci_halt_input(void *handle)
 	return 0;
 }
 
-/* get audio device information */
-int
-cmpci_getdev(void *handle, struct audio_device *ad)
-{
-	struct cmpci_softc *sc = handle;
-
-	strncpy(ad->name, "CMI PCI Audio", sizeof(ad->name));
-	snprintf(ad->version, sizeof(ad->version), "0x%02x (%d)",
-		 PCI_REVISION(sc->sc_class), sc->sc_version);
-	switch (PCI_PRODUCT(sc->sc_id)) {
-	case PCI_PRODUCT_CMI_CMI8338A:
-		strncpy(ad->config, "CMI8338A", sizeof(ad->config));
-		break;
-	case PCI_PRODUCT_CMI_CMI8338B:
-		strncpy(ad->config, "CMI8338B", sizeof(ad->config));
-		break;
-	case PCI_PRODUCT_CMI_CMI8738:
-		strncpy(ad->config, "CMI8738", sizeof(ad->config));
-		break;
-	case PCI_PRODUCT_CMI_CMI8738B:
-		strncpy(ad->config, "CMI8738B", sizeof(ad->config));
-		break;
-	default:
-		strncpy(ad->config, "unknown", sizeof(ad->config));
-	}
-
-	return 0;
-}
-
 /* mixer device information */
 int
 cmpci_query_devinfo(void *handle, mixer_devinfo_t *dip)
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index b60bd6e82da..08974810f2f 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4280.c,v 1.49 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: cs4280.c,v 1.50 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $	*/
 
 /*
@@ -201,8 +201,6 @@ int	cs4280_round_blocksize(void *, int);
 int	cs4280_halt_output(void *);
 int	cs4280_halt_input(void *);
 
-int	cs4280_getdev(void *, struct audio_device *);
-
 int	cs4280_mixer_set_port(void *, mixer_ctrl_t *);
 int	cs4280_mixer_get_port(void *, mixer_ctrl_t *);
 int	cs4280_query_devinfo(void *addr, mixer_devinfo_t *dip);
@@ -249,7 +247,6 @@ struct audio_hw_if cs4280_hw_if = {
 	cs4280_halt_output,
 	cs4280_halt_input,
 	NULL,
-	cs4280_getdev,
 	NULL,
 	cs4280_mixer_set_port,
 	cs4280_mixer_get_port,
@@ -274,13 +271,6 @@ struct midi_hw_if cs4280_midi_hw_if = {
 #endif
 
 	
-
-struct audio_device cs4280_device = {
-	"CS4280",
-	"",
-	"cs4280"
-};
-
 const struct pci_matchid cs4280_devices[] = {
 	{ PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4280 },
 	{ PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4610 },
@@ -1150,13 +1140,6 @@ cs4280_halt_input(void *addr)
 }
 
 int
-cs4280_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = cs4280_device;
-	return (0);
-}
-
-int
 cs4280_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct cs4280_softc *sc = addr;
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 4a52dbde4e3..98404e94e4b 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4281.c,v 1.35 2016/09/14 06:12:19 ratchov Exp $ */
+/*	$OpenBSD: cs4281.c,v 1.36 2016/09/19 06:46:44 ratchov Exp $ */
 /*	$Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $	*/
 
 /*
@@ -154,7 +154,6 @@ int cs4281_set_params(void *, int, int, struct audio_params *,
 				     struct audio_params *);
 int cs4281_halt_output(void *);
 int cs4281_halt_input(void *);
-int cs4281_getdev(void *, struct audio_device *);
 int cs4281_trigger_output(void *, void *, void *, int, void (*)(void *),
 			  void *, struct audio_params *);
 int cs4281_trigger_input(void *, void *, void *, int, void (*)(void *),
@@ -208,7 +207,6 @@ struct audio_hw_if cs4281_hw_if = {
 	cs4281_halt_output,
 	cs4281_halt_input,
 	NULL,
-	cs4281_getdev,
 	NULL,
 	cs4281_mixer_set_port,
 	cs4281_mixer_get_port,
@@ -247,13 +245,6 @@ struct cfdriver clct_cd = {
 	NULL, "clct", DV_DULL
 };
 
-struct audio_device cs4281_device = {
-	"CS4281",
-	"",
-	"cs4281"
-};
-
-
 int
 cs4281_match(parent, match, aux)
 	struct device *parent;
@@ -485,17 +476,6 @@ cs4281_halt_input(addr)
 	return (0);
 }
 
-/* trivial */
-int
-cs4281_getdev(addr, retp)
-     void *addr;
-     struct audio_device *retp;
-{
-	*retp = cs4281_device;
-	return (0);
-}
-
-
 int
 cs4281_trigger_output(addr, start, end, blksize, intr, arg, param)
 	void *addr;
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 27322dcfe92..69f71d044b2 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: eap.c,v 1.52 2016/09/14 06:12:19 ratchov Exp $ */
+/*      $OpenBSD: eap.c,v 1.53 2016/09/19 06:46:44 ratchov Exp $ */
 /*	$NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
 
 /*
@@ -169,7 +169,6 @@ int	eap_halt_output(void *);
 int	eap_halt_input(void *);
 int	eap_resume(struct eap_softc *);
 void    eap1370_write_codec(struct eap_softc *, int, int);
-int	eap_getdev(void *, struct audio_device *);
 int	eap1370_mixer_set_port(void *, mixer_ctrl_t *);
 int	eap1370_mixer_get_port(void *, mixer_ctrl_t *);
 int	eap1371_mixer_set_port(void *, mixer_ctrl_t *);
@@ -208,7 +207,6 @@ struct audio_hw_if eap1370_hw_if = {
 	eap_halt_output,
 	eap_halt_input,
 	NULL,
-	eap_getdev,
 	NULL,
 	eap1370_mixer_set_port,
 	eap1370_mixer_get_port,
@@ -234,7 +232,6 @@ struct audio_hw_if eap1371_hw_if = {
 	eap_halt_output,
 	eap_halt_input,
 	NULL,
-	eap_getdev,
 	NULL,
 	eap1371_mixer_set_port,
 	eap1371_mixer_get_port,
@@ -258,12 +255,6 @@ struct midi_hw_if eap_midi_hw_if = {
 };
 #endif
 
-struct audio_device eap_device = {
-	"Ensoniq AudioPCI",
-	"",
-	"eap"
-};
-
 const struct pci_matchid eap_devices[] = {
 	{ PCI_VENDOR_CREATIVELABS, PCI_PRODUCT_CREATIVELABS_EV1938 },
 	{ PCI_VENDOR_ENSONIQ, PCI_PRODUCT_ENSONIQ_AUDIOPCI },
@@ -1115,13 +1106,6 @@ eap_halt_input(void *addr)
 }
 
 int
-eap_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = eap_device;
-	return (0);
-}
-
-int
 eap1371_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct eap_softc *sc = addr;
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 834041199fe..72582ef38ba 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxki.c,v 1.50 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: emuxki.c,v 1.51 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -172,7 +172,6 @@ int	emuxki_trigger_input(void *, void *, void *, int, void (*) (void *),
 int	emuxki_halt_output(void *);
 int	emuxki_halt_input(void *);
 
-int	emuxki_getdev(void *, struct audio_device *);
 int	emuxki_set_port(void *, mixer_ctrl_t *);
 int	emuxki_get_port(void *, mixer_ctrl_t *);
 int	emuxki_query_devinfo(void *, mixer_devinfo_t *);
@@ -226,7 +225,6 @@ struct audio_hw_if emuxki_hw_if = {
 	emuxki_halt_output,
 	emuxki_halt_input,
 	NULL,			/* speaker_ctl */
-	emuxki_getdev,
 	NULL,			/* setfd */
 	emuxki_set_port,
 	emuxki_get_port,
@@ -460,29 +458,19 @@ emuxki_attach(struct device *parent, struct device *self, void *aux)
                 if (PCI_REVISION(pa->pa_class) == 0x04 ||
 		    PCI_REVISION(pa->pa_class) == 0x08) {
 			sc->sc_flags |= EMUXKI_AUDIGY2;
-			strlcpy(sc->sc_audv.name, "Audigy2", sizeof sc->sc_audv.name);
-		} else {
-			strlcpy(sc->sc_audv.name, "Audigy", sizeof sc->sc_audv.name);
 		}
 	} else if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_AUDIGY2) {
 		sc->sc_flags |= EMUXKI_AUDIGY | EMUXKI_AUDIGY2;
 		if (pci_conf_read(pa->pa_pc, pa->pa_tag,
 		    PCI_SUBSYS_ID_REG) == 0x10011102) {
 			sc->sc_flags |= EMUXKI_CA0108;
-			strlcpy(sc->sc_audv.name, "Audigy2Value", sizeof sc->sc_audv.name);
-		} else
-			strlcpy(sc->sc_audv.name, "Audigy2", sizeof sc->sc_audv.name);
+		}
 	} else if (pci_conf_read(pa->pa_pc, pa->pa_tag,
 	    PCI_SUBSYS_ID_REG) == EMU_SUBSYS_APS) {
 		sc->sc_flags |= EMUXKI_APS;
-		strlcpy(sc->sc_audv.name, "E-mu APS", sizeof sc->sc_audv.name);
 	} else {
 		sc->sc_flags |= EMUXKI_SBLIVE;
-		strlcpy(sc->sc_audv.name, "SB Live!", sizeof sc->sc_audv.name);
 	}
-	snprintf(sc->sc_audv.version, sizeof sc->sc_audv.version, "0x%02x",
-		 PCI_REVISION(pa->pa_class));
-	strlcpy(sc->sc_audv.config, "emuxki", sizeof sc->sc_audv.config);
 
 	if (emuxki_scinit(sc, 0) ||
 	    /* APS has no ac97 XXX */
@@ -2170,14 +2158,6 @@ emuxki_halt_input(void *addr)
 }
 
 int
-emuxki_getdev(void *v, struct audio_device *adp)
-{
-	struct emuxki_softc *sc = v;
-	*adp = sc->sc_audv;
-	return 0;
-}
-
-int
 emuxki_set_port(void *addr, mixer_ctrl_t *mctl)
 {
 	struct emuxki_softc *sc = addr;
diff --git a/sys/dev/pci/emuxkivar.h b/sys/dev/pci/emuxkivar.h
index 09626006e79..6520c2a4160 100644
--- a/sys/dev/pci/emuxkivar.h
+++ b/sys/dev/pci/emuxkivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emuxkivar.h,v 1.10 2008/12/09 12:30:12 brad Exp $	*/
+/*	$OpenBSD: emuxkivar.h,v 1.11 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: emuxkivar.h,v 1.1 2001/10/17 18:39:41 jdolecek Exp $	*/
 
 /*-
@@ -219,7 +219,6 @@ struct emuxki_stream {
 
 struct emuxki_softc {
 	struct device   sc_dev;
-	struct audio_device sc_audv;
 
 	/* Autoconfig parameters */
 	bus_space_tag_t 	sc_iot;
diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c
index 5f0617d019d..22fac13812f 100644
--- a/sys/dev/pci/envy.c
+++ b/sys/dev/pci/envy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: envy.c,v 1.67 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: envy.c,v 1.68 2016/09/19 06:46:44 ratchov Exp $	*/
 /*
  * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
  *
@@ -108,7 +108,6 @@ int envy_trigger_input(void *, void *, void *, int,
     void (*)(void *), void *, struct audio_params *);
 int envy_halt_output(void *);
 int envy_halt_input(void *);
-int envy_getdev(void *, struct audio_device *);
 int envy_query_devinfo(void *, struct mixer_devinfo *);
 int envy_get_port(void *, struct mixer_ctrl *);
 int envy_set_port(void *, struct mixer_ctrl *);
@@ -189,7 +188,6 @@ struct audio_hw_if envy_hw_if = {
 	envy_halt_output,	/* halt_output */
 	envy_halt_input,	/* halt_input */
 	NULL,			/* speaker_ctl */
-	envy_getdev,		/* getdev */
 	NULL,			/* setfd */
 	envy_set_port,		/* set_port */
 	envy_get_port,		/* get_port */
@@ -2169,17 +2167,6 @@ envy_halt_input(void *self)
 }
 
 int
-envy_getdev(void *self, struct audio_device *dev)
-{
-	struct envy_softc *sc = (struct envy_softc *)self;
-
-	strlcpy(dev->name, sc->isht ? "Envy24HT" : "Envy24", MAX_AUDIO_DEV_LEN);
-	strlcpy(dev->version, "-", MAX_AUDIO_DEV_LEN);
-	strlcpy(dev->config, sc->card->name, MAX_AUDIO_DEV_LEN);
-	return 0;
-}
-
-int
 envy_query_devinfo(void *self, struct mixer_devinfo *dev)
 {
 	struct envy_softc *sc = (struct envy_softc *)self;
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 5fa77a88a98..72e762308c5 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esa.c,v 1.30 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: esa.c,v 1.31 2016/09/19 06:46:44 ratchov Exp $	*/
 /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
 
 /*
@@ -91,12 +91,6 @@ static struct esa_card_type {
 	{ 0, 0, 0, 0, 0 }
 };
 
-struct audio_device esa_device = {
-	"ESS Allegro",
-	"",
-	"esa"
-};
-
 int		esa_match(struct device *, void *, void *);
 void		esa_attach(struct device *, struct device *, void *);
 int		esa_detach(struct device *, int);
@@ -116,7 +110,6 @@ int		esa_get_port(void *, mixer_ctrl_t *);
 int		esa_query_devinfo(void *, mixer_devinfo_t *);
 void *		esa_malloc(void *, int, size_t, int, int);
 void		esa_free(void *, void *, int);
-int		esa_getdev(void *, struct audio_device *);
 size_t		esa_round_buffersize(void *, int, size_t);
 int		esa_get_props(void *);
 int		esa_trigger_output(void *, void *, void *, int,
@@ -172,7 +165,6 @@ struct audio_hw_if esa_hw_if = {
 	esa_halt_output,
 	esa_halt_input,
 	NULL,			/* speaker_ctl */
-	esa_getdev,
 	NULL,			/* getfd */
 	esa_set_port,
 	esa_get_port,
@@ -465,15 +457,6 @@ esa_free(void *hdl, void *addr, int type)
 }
 
 int
-esa_getdev(void *hdl, struct audio_device *ret)
-{
-
-	*ret = esa_device;
-
-	return (0);
-}
-
-int
 esa_set_port(void *hdl, mixer_ctrl_t *mc)
 {
 	struct esa_voice *vc = hdl;
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 6ee8f1fc1a9..41f42e06e62 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eso.c,v 1.42 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: eso.c,v 1.43 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $	*/
 
 /*
@@ -110,7 +110,6 @@ int	eso_set_params(void *, int, int, struct audio_params *,
 int	eso_round_blocksize(void *, int);
 int	eso_halt_output(void *);
 int	eso_halt_input(void *);
-int	eso_getdev(void *, struct audio_device *);
 int	eso_set_port(void *, mixer_ctrl_t *);
 int	eso_get_port(void *, mixer_ctrl_t *);
 int	eso_query_devinfo(void *, mixer_devinfo_t *);
@@ -137,7 +136,6 @@ struct audio_hw_if eso_hw_if = {
 	eso_halt_output,
 	eso_halt_input,
 	NULL,			/* speaker_ctl */
-	eso_getdev,
 	NULL,			/* setfd */
 	eso_set_port,
 	eso_get_port,
@@ -802,24 +800,6 @@ eso_halt_input(void *hdl)
 }
 
 int
-eso_getdev(void *hdl, struct audio_device *retp)
-{
-	struct eso_softc *sc = hdl;
-
-	strlcpy(retp->name, "ESS Solo-1", sizeof retp->name);
-	snprintf(retp->version, sizeof retp->version, "0x%02x",
-	    sc->sc_revision);
-	if (sc->sc_revision <
-	    sizeof (eso_rev2model) / sizeof (eso_rev2model[0]))
-		strlcpy(retp->config, eso_rev2model[sc->sc_revision],
-		    sizeof retp->config);
-	else
-		strlcpy(retp->config, "unknown", sizeof retp->config);
-
-	return (0);
-}
-
-int
 eso_set_port(void *hdl, mixer_ctrl_t *cp)
 {
 	struct eso_softc *sc = hdl;
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index c99f840720a..6511265d0e9 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fms.c,v 1.28 2016/09/14 06:12:19 ratchov Exp $ */
+/*	$OpenBSD: fms.c,v 1.29 2016/09/19 06:46:44 ratchov Exp $ */
 /*	$NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $	*/
 
 /*-
@@ -80,7 +80,6 @@ int	fms_set_params(void *, int, int, struct audio_params *,
 int	fms_round_blocksize(void *, int);
 int	fms_halt_output(void *);
 int	fms_halt_input(void *);
-int	fms_getdev(void *, struct audio_device *);
 int	fms_set_port(void *, mixer_ctrl_t *);
 int	fms_get_port(void *, mixer_ctrl_t *);
 int	fms_query_devinfo(void *, mixer_devinfo_t *);
@@ -100,13 +99,6 @@ struct cfattach fms_ca = {
 	sizeof (struct fms_softc), fms_match, fms_attach
 };
 
-struct audio_device fms_device = {
-	"Forte Media 801",
-	"1.0",
-	"fms"
-};
-
-
 struct audio_hw_if fms_hw_if = {
 	fms_open,
 	fms_close,
@@ -120,7 +112,6 @@ struct audio_hw_if fms_hw_if = {
 	fms_halt_output,
 	fms_halt_input,
 	NULL,
-	fms_getdev,
 	NULL,
 	fms_set_port,
 	fms_get_port,
@@ -547,13 +538,6 @@ fms_halt_input(void *addr)
 }
 
 int
-fms_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = fms_device;
-	return 0;
-}
-
-int
 fms_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct fms_softc *sc = addr;
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index 02e601fe254..d7426e230ac 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maestro.c,v 1.41 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: maestro.c,v 1.42 2016/09/19 06:46:44 ratchov Exp $	*/
 /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
 /*
  * FreeBSD's ESS Agogo/Maestro driver 
@@ -441,7 +441,6 @@ struct maestro_softc {
 
 	struct ac97_codec_if	*codec_if;
 	struct ac97_host_if	host_if;
-	struct audio_device	*sc_audev;
 
 	int			suspend;
 
@@ -472,7 +471,6 @@ int	maestro_set_params(void *, int, int, struct audio_params *,
 int	maestro_round_blocksize(void *, int);
 int	maestro_halt_output(void *);
 int	maestro_halt_input(void *);
-int	maestro_getdev(void *, struct audio_device *);
 int	maestro_set_port(void *, mixer_ctrl_t *);
 int	maestro_get_port(void *, mixer_ctrl_t *);
 int	maestro_query_devinfo(void *, mixer_devinfo_t *);
@@ -542,7 +540,6 @@ struct audio_hw_if maestro_hw_if = {
 	maestro_halt_output,
 	maestro_halt_input,
 	NULL,
-	maestro_getdev,
 	NULL,
 	maestro_set_port,
 	maestro_get_port,
@@ -555,10 +552,6 @@ struct audio_hw_if maestro_hw_if = {
 	maestro_trigger_input
 };
 
-struct audio_device maestro_audev = {
-	"ESS Maestro", "", "maestro"
-};
-
 struct {
 	u_short vendor, product;
 	int flags;
@@ -616,7 +609,6 @@ maestro_attach(struct device *parent, struct device *self, void *aux)
 	int dmastage = 0;
 	int rseg;
 
-	sc->sc_audev = &maestro_audev;
 	sc->flags = maestro_get_flags(pa);
 
 	sc->pc = pa->pa_pc;
@@ -864,15 +856,6 @@ maestro_get_props(void *self)
 }
 
 int
-maestro_getdev(void *self, struct audio_device *retp)
-{
-	struct maestro_softc *sc = (struct maestro_softc *)self;
-
-	*retp = *sc->sc_audev;
-	return 0;
-}
-
-int
 maestro_set_port(void *self, mixer_ctrl_t *cp)
 {
 	struct ac97_codec_if *c = ((struct maestro_softc *)self)->codec_if;
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index 0130c9bfc5f..aeb3a6d7006 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: neo.c,v 1.31 2016/09/14 06:12:19 ratchov Exp $       */
+/*      $OpenBSD: neo.c,v 1.32 2016/09/19 06:46:44 ratchov Exp $       */
 
 /*
  * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -188,7 +188,6 @@ int	neo_trigger_input(void *, void *, void *, int, void (*)(void *),
 	    void *, struct audio_params *);
 int	neo_halt_output(void *);
 int	neo_halt_input(void *);
-int	neo_getdev(void *, struct audio_device *);
 int	neo_mixer_set_port(void *, mixer_ctrl_t *);
 int	neo_mixer_get_port(void *, mixer_ctrl_t *);
 int     neo_attach_codec(void *sc, struct ac97_codec_if *);
@@ -214,12 +213,6 @@ struct cfattach neo_ca = {
 };
 
 
-struct audio_device neo_device = {
-	"NeoMagic 256",
-	"",
-	"neo"
-};
-
 #if 0
 static u_int32_t badcards[] = {
 	0x0007103c,
@@ -261,7 +254,6 @@ struct audio_hw_if neo_hw_if = {
 	neo_halt_output,
 	neo_halt_input,
 	NULL,
-	neo_getdev,
 	NULL,
 	neo_mixer_set_port,
 	neo_mixer_get_port,
@@ -891,13 +883,6 @@ neo_halt_input(void *addr)
 }
 
 int
-neo_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = neo_device;
-	return (0);
-}
-
-int
 neo_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct neo_softc *sc = addr;
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 8f437896e47..ca07e26601f 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sv.c,v 1.33 2016/09/14 06:12:19 ratchov Exp $ */
+/*      $OpenBSD: sv.c,v 1.34 2016/09/19 06:46:44 ratchov Exp $ */
 
 /*
  * Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -124,12 +124,6 @@ struct cfattach sv_ca = {
 	sizeof(struct sv_softc), sv_match, sv_attach
 };
 
-struct audio_device sv_device = {
-	"S3 SonicVibes",
-	"",
-	"sv"
-};
-
 #define ARRAY_SIZE(foo)  ((sizeof(foo)) / sizeof(foo[0]))
 
 int	sv_allocmem(struct sv_softc *, size_t, size_t, struct sv_dma *);
@@ -145,7 +139,6 @@ int	sv_dma_output(void *, void *, int, void (*)(void *), void *);
 int	sv_dma_input(void *, void *, int, void (*)(void *), void *);
 int	sv_halt_in_dma(void *);
 int	sv_halt_out_dma(void *);
-int	sv_getdev(void *, struct audio_device *);
 int	sv_mixer_set_port(void *, mixer_ctrl_t *);
 int	sv_mixer_get_port(void *, mixer_ctrl_t *);
 int	sv_query_devinfo(void *, mixer_devinfo_t *);
@@ -168,7 +161,6 @@ struct audio_hw_if sv_hw_if = {
 	sv_halt_out_dma,
 	sv_halt_in_dma,
 	NULL,
-	sv_getdev,
 	NULL,
 	sv_mixer_set_port,
 	sv_mixer_get_port,
@@ -822,14 +814,6 @@ sv_halt_in_dma(void *addr)
         return (0);
 }
 
-int
-sv_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = sv_device;
-        return (0);
-}
-
-
 /*
  * Mixer related code is here
  *
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index db6abf32022..f3c9f1045a4 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yds.c,v 1.53 2016/09/14 06:12:19 ratchov Exp $	*/
+/*	$OpenBSD: yds.c,v 1.54 2016/09/19 06:46:44 ratchov Exp $	*/
 /*	$NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $	*/
 
 /*
@@ -161,7 +161,6 @@ int	yds_trigger_input(void *, void *, void *, int, void (*)(void *),
 	    void *, struct audio_params *);
 int	yds_halt_output(void *);
 int	yds_halt_input(void *);
-int	yds_getdev(void *, struct audio_device *);
 int	yds_mixer_set_port(void *, mixer_ctrl_t *);
 int	yds_mixer_get_port(void *, mixer_ctrl_t *);
 void   *yds_malloc(void *, int, size_t, int, int);
@@ -213,7 +212,6 @@ static struct audio_hw_if yds_hw_if = {
 	yds_halt_output,
 	yds_halt_input,
 	NULL,
-	yds_getdev,
 	NULL,
 	yds_mixer_set_port,
 	yds_mixer_get_port,
@@ -226,12 +224,6 @@ static struct audio_hw_if yds_hw_if = {
 	yds_trigger_input
 };
 
-struct audio_device yds_device = {
-	"Yamaha DS-1",
-	"",
-	"yds"
-};
-
 const static struct {
 	u_int	id;
 	u_int	flags;
@@ -1484,14 +1476,6 @@ yds_halt_input(void *addr)
 }
 
 int
-yds_getdev(void *addr, struct audio_device *retp)
-{
-	*retp = yds_device;
-
-	return 0;
-}
-
-int
 yds_mixer_set_port(void *addr, mixer_ctrl_t *cp)
 {
 	struct yds_softc *sc = addr;
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index 896fc1edf60..62a4b435b34 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4231.c,v 1.36 2016/09/14 06:12:20 ratchov Exp $	*/
+/*	$OpenBSD: cs4231.c,v 1.37 2016/09/19 06:46:44 ratchov Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -140,7 +140,6 @@ int	cs4231_round_blocksize(void *, int);
 int	cs4231_commit_settings(void *);
 int	cs4231_halt_output(void *);
 int	cs4231_halt_input(void *);
-int	cs4231_getdev(void *, struct audio_device *);
 int	cs4231_set_port(void *, mixer_ctrl_t *);
 int	cs4231_get_port(void *, mixer_ctrl_t *);
 int	cs4231_query_devinfo(void *, mixer_devinfo_t *);
@@ -165,7 +164,6 @@ struct audio_hw_if cs4231_sa_hw_if = {
 	cs4231_halt_output,
 	cs4231_halt_input,
 	0,
-	cs4231_getdev,
 	0,
 	cs4231_set_port,
 	cs4231_get_port,
@@ -186,12 +184,6 @@ struct cfdriver audiocs_cd = {
 	NULL, "audiocs", DV_DULL
 };
 
-struct audio_device cs4231_device = {
-	"SUNW,CS4231",
-	"b",
-	"onboard1",
-};
-
 int
 cs4231_match(struct device *parent, void *vcf, void *aux)
 {
@@ -650,13 +642,6 @@ cs4231_halt_input(void *vsc)
 }
 
 int
-cs4231_getdev(void *vsc, struct audio_device *retp)
-{
-	*retp = cs4231_device;
-	return (0);
-}
-
-int
 cs4231_set_port(void *vsc, mixer_ctrl_t *cp)
 {
 	struct cs4231_softc *sc = (struct cs4231_softc *)vsc;
diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c
index d0df5e0b3a8..41c7b43a8ce 100644
--- a/sys/dev/tc/bba.c
+++ b/sys/dev/tc/bba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bba.c,v 1.6 2016/09/14 06:12:20 ratchov Exp $	*/
+/*	$OpenBSD: bba.c,v 1.7 2016/09/19 06:46:44 ratchov Exp $	*/
 /* $NetBSD: bba.c,v 1.38 2011/06/04 01:27:57 tsutsui Exp $ */
 /*
  * Copyright (c) 2011 Miodrag Vallat.
@@ -143,7 +143,6 @@ struct am7930_glue bba_glue = {
 int	bba_round_blocksize(void *, int);
 int	bba_halt_output(void *);
 int	bba_halt_input(void *);
-int	bba_getdev(void *, struct audio_device *);
 void	*bba_allocm(void *, int, size_t, int, int);
 void	bba_freem(void *, void *, int);
 size_t	bba_round_buffersize(void *, int, size_t);
@@ -166,7 +165,6 @@ struct audio_hw_if bba_hw_if = {
 	bba_halt_output,		/* md */
 	bba_halt_input,			/* md */
 	NULL,
-	bba_getdev,
 	NULL,
 	am7930_set_port,
 	am7930_get_port,
@@ -179,12 +177,6 @@ struct audio_hw_if bba_hw_if = {
 	bba_trigger_input		/* md */
 };
 
-static struct audio_device bba_device = {
-	"am7930",
-	"x",
-	"bba"
-};
-
 int	bba_intr(void *);
 void	bba_reset(struct bba_softc *, int);
 void	bba_codec_dwrite(struct am7930_softc *, int, uint8_t);
@@ -418,13 +410,6 @@ bba_halt_input(void *v)
 }
 
 int
-bba_getdev(void *v, struct audio_device *retp)
-{
-	*retp = bba_device;
-	return 0;
-}
-
-int
 bba_trigger_output(void *v, void *start, void *end, int blksize,
     void (*intr)(void *), void *arg, struct audio_params *param)
 {
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 7b6e6b4c5ac..0aac9cb64d1 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.114 2016/09/14 06:12:20 ratchov Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.115 2016/09/19 06:46:44 ratchov Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -386,7 +386,6 @@ int	uaudio_trigger_input
 	 struct audio_params *);
 int	uaudio_halt_in_dma(void *);
 int	uaudio_halt_out_dma(void *);
-int	uaudio_getdev(void *, struct audio_device *);
 int	uaudio_mixer_set_port(void *, mixer_ctrl_t *);
 int	uaudio_mixer_get_port(void *, mixer_ctrl_t *);
 int	uaudio_query_devinfo(void *, mixer_devinfo_t *);
@@ -405,7 +404,6 @@ struct audio_hw_if uaudio_hw_if = {
 	uaudio_halt_out_dma,
 	uaudio_halt_in_dma,
 	NULL,
-	uaudio_getdev,
 	NULL,
 	uaudio_mixer_set_port,
 	uaudio_mixer_get_port,
@@ -418,12 +416,6 @@ struct audio_hw_if uaudio_hw_if = {
 	uaudio_trigger_input
 };
 
-struct audio_device uaudio_device = {
-	"USB audio",
-	"",
-	"uaudio"
-};
-
 int uaudio_match(struct device *, void *, void *); 
 void uaudio_attach(struct device *, struct device *, void *); 
 int uaudio_detach(struct device *, int); 
@@ -2165,19 +2157,6 @@ uaudio_halt_in_dma(void *addr)
 	return (0);
 }
 
-int
-uaudio_getdev(void *addr, struct audio_device *retp)
-{
-	struct uaudio_softc *sc = addr;
-
-	DPRINTF(("uaudio_mixer_getdev:\n"));
-	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
-
-	*retp = uaudio_device;
-	return (0);
-}
-
 /*
  * Make sure the block size is large enough to hold at least 1 transfer.
  * Ideally, the block size should be a multiple of the transfer size.
diff --git a/sys/dev/usb/utvfu.c b/sys/dev/usb/utvfu.c
index dbf36fdd5fa..0ca21ef5614 100644
--- a/sys/dev/usb/utvfu.c
+++ b/sys/dev/usb/utvfu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utvfu.c,v 1.8 2016/09/14 06:12:20 ratchov Exp $ */
+/*	$OpenBSD: utvfu.c,v 1.9 2016/09/19 06:46:44 ratchov Exp $ */
 /*
  * Copyright (c) 2013 Lubomir Rintel
  * Copyright (c) 2013 Federico Simoncelli
@@ -776,7 +776,6 @@ int		utvfu_audio_set_params(void *, int, int,
 		    struct audio_params *, struct audio_params *);
 int		utvfu_audio_halt_out(void *);
 int		utvfu_audio_halt_in(void *);
-int		utvfu_audio_getdev(void *, struct audio_device *);
 int		utvfu_audio_mixer_set_port(void *, struct mixer_ctrl *);
 int		utvfu_audio_mixer_get_port(void *, struct mixer_ctrl *);
 int		utvfu_audio_query_devinfo(void *, struct mixer_devinfo *);
@@ -827,13 +826,6 @@ struct video_hw_if utvfu_vid_hw_if = {
 	utvfu_start_read	/* start stream for read */
 };
 
-
-struct audio_device utvfu_audio_device = {
-	"UTVFU Audio",	/* name */
-	"",		/* version */
-	"utvfu"		/* config */
-};
-
 struct audio_hw_if utvfu_au_hw_if = {
 	utvfu_audio_open,		/* open hardware */
 	utvfu_audio_close,		/* close hardware */
@@ -847,7 +839,6 @@ struct audio_hw_if utvfu_au_hw_if = {
 	utvfu_audio_halt_out,
 	utvfu_audio_halt_in,
 	NULL,
-	utvfu_audio_getdev,
 	NULL,
 	utvfu_audio_mixer_set_port,
 	utvfu_audio_mixer_get_port,
@@ -1924,18 +1915,6 @@ utvfu_audio_halt_in(void *v)
 }
 
 int
-utvfu_audio_getdev(void *v, struct audio_device *retp)
-{
-	struct utvfu_softc *sc = v;
-
-	if (usbd_is_dying(sc->sc_udev))
-		return (EIO);
-
-	*retp = utvfu_audio_device;
-	return (0);
-}
-
-int
 utvfu_audio_mixer_set_port(void *v, struct mixer_ctrl *cp)
 {
 	struct utvfu_softc *sc = v;