summaryrefslogtreecommitdiff
path: root/sys/arch/loongson/dev/kb3310.c
diff options
context:
space:
mode:
authorPaul Irofti <pirofti@cvs.openbsd.org>2010-09-01 13:10:43 +0000
committerPaul Irofti <pirofti@cvs.openbsd.org>2010-09-01 13:10:43 +0000
commit0f2f71bb272dbc114719fadbea707bd36f9c8726 (patch)
tree156cbb1e198ee41b74a1d4607fceb5c719ec6c3e /sys/arch/loongson/dev/kb3310.c
parenta18ca8e9d46f435d0896ef5eda92f2d2eb889cb7 (diff)
Clean-up the spl dance around suspend/resume. Okay miod@.
Diffstat (limited to 'sys/arch/loongson/dev/kb3310.c')
-rw-r--r--sys/arch/loongson/dev/kb3310.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arch/loongson/dev/kb3310.c b/sys/arch/loongson/dev/kb3310.c
index e986d6e7298..a91ed859b38 100644
--- a/sys/arch/loongson/dev/kb3310.c
+++ b/sys/arch/loongson/dev/kb3310.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kb3310.c,v 1.13 2010/08/31 12:22:38 miod Exp $ */
+/* $OpenBSD: kb3310.c,v 1.14 2010/09/01 13:10:42 pirofti Exp $ */
/*
* Copyright (c) 2010 Otto Moerbeek <otto@drijf.net>
*
@@ -93,7 +93,6 @@ struct ykbec_softc {
static struct ykbec_softc *ykbec_sc;
static int ykbec_chip_config;
-static int ykbec_apmspl;
extern void loongson_set_isa_imr(uint);
@@ -446,9 +445,6 @@ ykbec_suspend()
struct ykbec_softc *sc = ykbec_sc;
int ctrl;
- /* IRQ */
- DPRINTF(("IRQ\n"));
- ykbec_apmspl = splhigh();
/* enable isa irq 1 and 12 (PS/2 input devices) */
loongson_set_isa_imr((1 << 1) | (1 << 12));
@@ -482,10 +478,6 @@ ykbec_resume()
{
struct ykbec_softc *sc = ykbec_sc;
- /* IRQ */
- DPRINTF(("IRQ\n"));
- splx(ykbec_apmspl);
-
/* CPU */
DPRINTF(("CPU\n"));
REGVAL(LOONGSON_CHIP_CONFIG0) = ykbec_chip_config;