diff --git a/share/man/man9/audio.9 b/share/man/man9/audio.9
index 5d40f92c38e2..79e54a721a22 100644
--- a/share/man/man9/audio.9
+++ b/share/man/man9/audio.9
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.9,v 1.18 2001/10/02 23:58:03 augustss Exp $
+.\"	$NetBSD: audio.9,v 1.19 2001/10/03 20:50:31 augustss Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -92,8 +92,7 @@ struct audio_hw_if {
 		    void (*)(void *), void *, struct audio_params *);
 	int	(*trigger_input)(void *, void *, void *, int,
 		    void (*)(void *), void *, struct audio_params *);
-	int	(*dev_ioctl)(struct audio_softc *sc, u_long cmd,
-		    caddr_t addr, int flag, struct proc *p);
+	int	(*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
 };
 
 struct audio_params {
@@ -411,7 +410,7 @@ should be called with the argument
 Once started the transfer may be stopped using
 .Va halt_input .
 Return 0 on success, otherwise an error code.
-.It Dv int dev_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr,
+.It Dv int dev_ioctl(void *hdl, u_long cmd, caddr_t addr,
 .br
 .Dv "int flag, struct proc *p)"
 .br
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 8842e01c90ac..ecfaf879449a 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.141 2001/10/03 00:04:49 augustss Exp $	*/
+/*	$NetBSD: audio.c,v 1.142 2001/10/03 20:48:41 augustss Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -1671,7 +1671,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
 
 	default:
 		if (hw->dev_ioctl) {
-			error = hw->dev_ioctl(sc, cmd, addr, flag, p);
+			error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
 		} else {
 			DPRINTF(("audio_ioctl: unknown ioctl\n"));
 			error = EINVAL;
@@ -2891,11 +2891,10 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
 		break;
 
 	default:
-		if (hw->dev_ioctl) {
-			error = hw->dev_ioctl(sc, cmd, addr, flag, p);
-		} else {
+		if (hw->dev_ioctl)
+			error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+		else
 			error = EINVAL;
-		}
 		break;
 	}
 	DPRINTF(("mixer_ioctl(%lu,'%c',%lu) result %d\n",
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index 450b9e8643e6..51cde42fb6a9 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio_if.h,v 1.37 2001/10/03 00:04:49 augustss Exp $	*/
+/*	$NetBSD: audio_if.h,v 1.38 2001/10/03 20:48:41 augustss Exp $	*/
 
 /*
  * Copyright (c) 1994 Havard Eidnes.
@@ -122,8 +122,7 @@ struct audio_hw_if {
 		    void (*)(void *), void *, struct audio_params *);
 	int	(*trigger_input)(void *, void *, void *, int,
 		    void (*)(void *), void *, struct audio_params *);
-	int	(*dev_ioctl)(struct audio_softc *sc, u_long cmd, caddr_t addr,
-		    int flag, struct proc *p);
+	int	(*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
 };
 
 struct audio_attach_args {