summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2013-11-04 11:57:27 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2013-11-04 11:57:27 +0000
commit80a45b38d4288005c113217084fe2013700780cd (patch)
tree1c11c2d90aeb4569c2d849fab54744c9c29ff3dd /sys/arch/sgi
parent7bc7d64f305711b4a1792780ed48d7a6e66b3b5e (diff)
Convert wskbd_set_mixervolume() to use a task internally instead of
being called in a workq. ok kettenis@
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/hpc/panel.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/sgi/hpc/panel.c b/sys/arch/sgi/hpc/panel.c
index e9e8bb16b7d..2e4e1ed5467 100644
--- a/sys/arch/sgi/hpc/panel.c
+++ b/sys/arch/sgi/hpc/panel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: panel.c,v 1.1 2012/04/17 15:23:01 miod Exp $ */
+/* $OpenBSD: panel.c,v 1.2 2013/11/04 11:57:26 mpi Exp $ */
/*
* Copyright (c) 2012 Miodrag Vallat.
@@ -22,7 +22,6 @@
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/timeout.h>
-#include <sys/workq.h>
#include <machine/autoconf.h>
#include <mips64/archtype.h>
@@ -36,7 +35,7 @@
#include "audio.h"
#include "wskbd.h"
-extern int wskbd_set_mixervolume(long);
+extern int wskbd_set_mixervolume(long, long);
struct panel_softc {
struct device sc_dev;
@@ -222,7 +221,6 @@ panel_volume_adjust(struct panel_softc *sc, uint8_t reg)
return;
}
- workq_add_task(NULL, 0, (workq_fn)wskbd_set_mixervolume,
- (void *)adjust, (void *)(int)1);
+ wskbd_set_mixervolume(adjust, 1);
}
#endif