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.

1 files changed, 1 insertions, 11 deletions

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 */
-}