quieten pcmcia/cardbus interrupt handling at unsuspend time

4 files changed, 16 insertions, 10 deletions

diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 47cb167b060..e1986cd9a15 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isa.c,v 1.12 2000/07/03 02:59:24 aaron Exp $	*/
+/*	$OpenBSD: i82365_isa.c,v 1.13 2001/08/17 21:52:16 deraadt Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -64,7 +64,7 @@ int	pcic_isa_probe __P((struct device *, void *, void *));
 void	pcic_isa_attach __P((struct device *, struct device *, void *));
 
 void	*pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
-	    struct pcmcia_function *, int, int (*) (void *), void *));
+	    struct pcmcia_function *, int, int (*) (void *), void *, char *));
 void	pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
 
 struct cfattach pcic_isa_ca = {
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index 55dd350d0d1..2519159c058 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isasubr.c,v 1.14 2000/07/03 19:02:47 niklas Exp $	*/
+/*	$OpenBSD: i82365_isasubr.c,v 1.15 2001/08/17 21:52:16 deraadt Exp $	*/
 /*	$NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $  */
 
 /*
@@ -184,12 +184,13 @@ pcic_isa_bus_width_probe(sc, iot, ioh, base, length)
 
 
 void *
-pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
+pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 	pcmcia_chipset_handle_t pch;
 	struct pcmcia_function *pf;
 	int ipl;
 	int (*fct) __P((void *));
 	void *arg;
+	char *xname;
 {
 	struct pcic_handle *h = (struct pcic_handle *)pch;
 	struct pcic_softc *sc = (struct pcic_softc *)(h->ph_parent);
@@ -218,7 +219,11 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
 	if (!ih)
 		return (NULL);
 
-	printf(" irq %d", irq);
+	if (xname) {
+		printf("%s: irq %d", xname, irq);
+		if (*xname)
+			printf("\n");
+	}
 	return (ih);
 }
 
diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h
index ef94d6a6fb0..c1951b4afa0 100644
--- a/sys/dev/isa/i82365_isavar.h
+++ b/sys/dev/isa/i82365_isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isavar.h,v 1.3 1999/08/11 12:02:07 niklas Exp $	*/
+/*	$OpenBSD: i82365_isavar.h,v 1.4 2001/08/17 21:52:16 deraadt Exp $	*/
 /*	$NetBSD: i82365_isavar.h,v 1.1 1998/06/07 18:28:31 sommerfe Exp $  */
 
 /*
@@ -39,7 +39,7 @@ extern int npcic_isa_intr_list;
  */
 
 void	*pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
-	    struct pcmcia_function *, int, int (*) (void *), void *));
+	    struct pcmcia_function *, int, int (*) (void *), void *, char *));
 void	pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
 
 /*
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 725e5e49fb3..aa91660a958 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2_isa.c,v 1.1 2000/05/15 04:17:29 jason Exp $	*/
+/*	$OpenBSD: tcic2_isa.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $	*/
 /*	$NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $	*/
 
 #undef	TCICISADEBUG
@@ -112,7 +112,7 @@ int	tcic_isa_probe __P((struct device *, void *, void *));
 void	tcic_isa_attach __P((struct device *, struct device *, void *));
 
 void	*tcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
-	    struct pcmcia_function *, int, int (*) (void *), void *));
+	    struct pcmcia_function *, int, int (*) (void *), void *, char *));
 void	tcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
 
 struct cfattach tcic_isa_ca = {
@@ -308,12 +308,13 @@ tcic_isa_attach(parent, self, aux)
 }
 
 void *
-tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg)
+tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 	pcmcia_chipset_handle_t pch;
 	struct pcmcia_function *pf;
 	int ipl;
 	int (*fct) __P((void *));
 	void *arg;
+	char *xname;
 {
 	struct tcic_handle *h = (struct tcic_handle *) pch;
 	int irq, ist, val, reg;