From 0835b779d1c574c0034dea0267b87f629c72facc Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Thu, 20 Jan 2000 19:27:03 +0000
Subject: [PATCH] Simplify sbdsp_pause().

---
 sys/dev/isa/sbdsp.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index f215b5d3442b..7744b30d1066 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbdsp.c,v 1.102 1999/11/01 18:12:20 augustss Exp $	*/
+/*	$NetBSD: sbdsp.c,v 1.103 2000/01/20 19:27:03 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -85,6 +85,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
@@ -215,7 +216,6 @@ static struct sbmode sbrmodes[] = {
 void	sbversion __P((struct sbdsp_softc *));
 void	sbdsp_jazz16_probe __P((struct sbdsp_softc *));
 void	sbdsp_set_mixer_gain __P((struct sbdsp_softc *sc, int port));
-void	sbdsp_to __P((void *));
 void	sbdsp_pause __P((struct sbdsp_softc *));
 int	sbdsp_set_timeconst __P((struct sbdsp_softc *, int));
 int	sbdsp16_set_rate __P((struct sbdsp_softc *, int, int));
@@ -1044,25 +1044,12 @@ sbdsp_rdsp(sc)
 	return -1;
 }
 
-/*
- * Doing certain things (like toggling the speaker) make
- * the SB hardware go away for a while, so pause a little.
- */
-void
-sbdsp_to(arg)
-	void *arg;
-{
-	wakeup(arg);
-}
-
 void
 sbdsp_pause(sc)
 	struct sbdsp_softc *sc;
 {
-	extern int hz;
 
-	timeout(sbdsp_to, sbdsp_to, hz/8);
-	(void)tsleep(sbdsp_to, PWAIT, "sbpause", 0);
+	(void) tsleep(sbdsp_pause, PWAIT, "sbpause", hz / 8);
 }
 
 /*