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.

3 files changed, 3 insertions, 17 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;
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 00717f211e5..8adc5d97be7 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbcvar.h,v 1.14 2013/05/23 18:29:51 tobias Exp $ */
+/* $OpenBSD: pckbcvar.h,v 1.15 2015/05/24 10:57:47 miod Exp $ */
 /* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -76,8 +76,6 @@ struct pckbc_softc {
 	pckbc_inputfcn inputhandler[PCKBC_NSLOTS];
 	void *inputarg[PCKBC_NSLOTS];
 	char *subname[PCKBC_NSLOTS];
-
-	void (*intr_establish)(struct pckbc_softc *, pckbc_slot_t);
 };
 
 struct pckbc_attach_args {
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index 43730a77c49..cce10af0ac2 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pckbc_isa.c,v 1.17 2015/05/21 19:32:29 miod Exp $	*/
+/*	$OpenBSD: pckbc_isa.c,v 1.18 2015/05/24 10:57:47 miod Exp $	*/
 /*	$NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp $	*/
 
 /*
@@ -48,8 +48,6 @@ const struct cfattach pckbc_isa_ca = {
 	NULL, pckbc_isa_activate
 };
 
-void	pckbc_isa_intr_establish(struct pckbc_softc *, pckbc_slot_t);
-
 int
 pckbc_isa_match(struct device *parent, void *match, void *aux)
 {
@@ -150,8 +148,6 @@ pckbc_isa_attach(struct device *parent, struct device *self, void *aux)
 		}
 	}
 
-	sc->intr_establish = pckbc_isa_intr_establish;
-
 	if (pckbc_is_console(iot, IO_KBD)) {
 		t = &pckbc_consdata;
 		pckbc_console_attached = 1;
@@ -175,9 +171,3 @@ pckbc_isa_attach(struct device *parent, struct device *self, void *aux)
 	/* Finish off the attach. */
 	pckbc_attach(sc, cf->cf_flags);
 }
-
-void
-pckbc_isa_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot)
-{
-	/* done in attach */
-}