summaryrefslogtreecommitdiff
path: root/sys/dev/ic/pckbc.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-05-24 10:57:48 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-05-24 10:57:48 +0000
commit0bfe10ff6b490b13d6550e2304b488d0afb422e2 (patch)
tree4ab36d0e6708881dd5a527bb5854ae7ce9b8bdc5 /sys/dev/ic/pckbc.c
parente2c608feb80b76c2b9ccc7ed1344ef193716b42d (diff)
Follow the recent pckbc@isa changes and always establish all the necessary
interrupts at pckbc attach time, and get rid of the `intr_establish' pckbc callback. Tested on hppa (gsckbc) and sgi (pckbc@hpc); not tested on sparc64 (pckbc@ebus) but this attachment was already behaving this way and its intr_establish callback was an empty function.
Diffstat (limited to 'sys/dev/ic/pckbc.c')
-rw-r--r--sys/dev/ic/pckbc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index ed34dd35ecb..e68738a3a06 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.48 2015/05/05 16:27:20 shadchin Exp $ */
+/* $OpenBSD: pckbc.c,v 1.49 2015/05/24 10:57:47 miod Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -949,8 +949,6 @@ pckbc_set_inputhandler(pckbc_tag_t self, pckbc_slot_t slot, pckbc_inputfcn func,
if (slot >= PCKBC_NSLOTS)
panic("pckbc_set_inputhandler: bad slot %d", slot);
- (*sc->intr_establish)(sc, slot);
-
sc->inputhandler[slot] = func;
sc->inputarg[slot] = arg;
sc->subname[slot] = name;