Use pcmcia_intr_string() for printing the irq (or error) string.

15 files changed, 85 insertions, 65 deletions

diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index ca933faeb7f..b125b9c5876 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_pcmcia.c,v 1.10 2002/03/14 01:27:00 millert Exp $	*/
+/*	$OpenBSD: aic_pcmcia.c,v 1.11 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $	*/
 
 /*
@@ -108,6 +108,7 @@ aic_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	struct pcmcia_function *pf = pa->pf;
+	const char *intrstr;
 
 	psc->sc_pf = pf;
 
@@ -161,13 +162,11 @@ aic_pcmcia_attach(parent, self, aux)
 
 	/* Establish the interrupt handler. */
 	psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_BIO,
-	    aicintr, sc, "");
-	if (psc->sc_ih == NULL) {
-		printf(": couldn't establish interrupt\n");
+	    aicintr, sc, sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih);
+	printf("%s%s\n", *intrstr ? ", " : "", intrstr);
+	if (psc->sc_ih == NULL)
 		return;
-	}
-
-	printf("\n");
 
 	aicattach(sc);
 
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 6da0eee0f26..fd202c85bba 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_pcmcia.c,v 1.38 2004/08/02 12:19:26 miod Exp $	*/
+/*	$OpenBSD: com_pcmcia.c,v 1.39 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $	*/
 
 /*
@@ -263,6 +263,7 @@ com_pcmcia_attach(parent, self, aux)
 	struct com_softc *sc = &psc->sc_com;
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
+	const char *intrstr;
 	int autoalloc = 0;
 
 	psc->sc_pf = pa->pf;
@@ -329,10 +330,11 @@ found:
 	com_attach_subr(sc);
 #endif
 	/* establish the interrupt. */
-	psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY,
-	    comintr, sc, "");
-	if (psc->sc_ih == NULL)
-		printf(", couldn't establish interrupt");
+	psc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY, comintr, sc,
+	    sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	com_pcmcia_attach2(sc);
 
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 5f9d2471552..8d7e2f2c3fc 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp_pcmcia.c,v 1.4 2002/03/14 01:27:00 millert Exp $	*/
+/*	$OpenBSD: esp_pcmcia.c,v 1.5 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: esp_pcmcia.c,v 1.8 2000/06/05 15:36:45 tsutsui Exp $	*/
 
 /*-
@@ -162,6 +162,7 @@ esp_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	struct pcmcia_function *pf = pa->pf;
+	const char *intrstr;
 
 	esc->sc_pf = pf;
 
@@ -200,11 +201,14 @@ esp_pcmcia_attach(parent, self, aux)
 	esp_pcmcia_init(esc);
 
 	esc->sc_ih = pcmcia_intr_establish(esc->sc_pf, IPL_BIO,
-	    ncr53c9x_intr, &esc->sc_ncr53c9x, "");
+	    ncr53c9x_intr, &esc->sc_ncr53c9x, esc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, esc->sc_ih);
 	if (esc->sc_ih == NULL) {
-		printf(": couldn't establish interrupt\n");
+		printf(", %s\n", intrstr);
 		goto iomap_failed;
 	}
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	/*
 	 *  Initialize nca board itself.
diff --git a/sys/dev/pcmcia/gpr.c b/sys/dev/pcmcia/gpr.c
index 027f5b198bf..89695ab642b 100644
--- a/sys/dev/pcmcia/gpr.c
+++ b/sys/dev/pcmcia/gpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpr.c,v 1.10 2003/06/02 19:21:49 fgsch Exp $	*/
+/*	$OpenBSD: gpr.c,v 1.11 2005/01/27 17:04:55 millert Exp $	*/
 
 /*
  * Copyright (c) 2002, Federico G. Schwindt
@@ -152,6 +152,7 @@ gpr_attach(struct device *parent, struct device *self, void *aux)
 	struct gpr_softc *sc = (void *)self;
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
+	const char *intrstr;
 
 	for (cfe = SIMPLEQ_FIRST(&pa->pf->cfe_head); cfe;
 	     cfe = SIMPLEQ_NEXT(cfe, cfe_list)) {
@@ -203,14 +204,10 @@ gpr_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_TTY, gpr_intr, sc,
 	    sc->sc_dev.dv_xname);
-	if (sc->sc_ih == NULL) {
-		printf(": couldn't establish interrupt\n");
-		goto fail_intr;
-	}
-
-	printf("\n");
-
-	return;
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+	printf("%s%s\n", *intrstr ? ", " : "", intrstr);
+	if (sc->sc_ih != NULL)
+		return;
 
 fail_intr:
 	pcmcia_mem_unmap(pa->pf, sc->sc_memwin);
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index e320697ad29..a295b5c26e2 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_pcmcia.c,v 1.12 2003/06/02 19:24:23 mickey Exp $	*/
+/*	$OpenBSD: if_an_pcmcia.c,v 1.13 2005/01/27 17:04:55 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -99,6 +99,7 @@ an_pcmcia_attach(parent, self, aux)
 	struct an_softc *sc = (struct an_softc *)self;
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
+	const char *intrstr;
 
 	psc->sc_pf = pa->pf;
 	cfe = SIMPLEQ_FIRST(&pa->pf->cfe_head);
@@ -126,9 +127,11 @@ an_pcmcia_attach(parent, self, aux)
 	sc->an_btag = psc->sc_pcioh.iot;
 	sc->an_bhandle = psc->sc_pcioh.ioh;
 
-	sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, an_intr, sc, "");
-	if (sc->sc_ih == NULL)
-		printf("no irq");
+	sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, an_intr, sc,
+	    sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	an_attach(sc);
 }
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 890bbdced37..27a3e8673b4 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,5 +1,5 @@
 /* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */
-/* $OpenBSD: if_awi_pcmcia.c,v 1.13 2004/11/23 21:12:23 fgsch Exp $ */
+/* $OpenBSD: if_awi_pcmcia.c,v 1.14 2005/01/27 17:04:55 millert Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -294,6 +294,7 @@ awi_pcmcia_attach(parent, self, aux)
 	struct awi_pcmcia_product *app;
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
+	const char *intrstr;
 #if 0
 	bus_addr_t memoff;
 #endif
@@ -348,12 +349,14 @@ awi_pcmcia_attach(parent, self, aux)
 
 	/* establish the interrupt. */
 	sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
-	    awi_intr, sc, "");
+	    awi_intr, sc, sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
 	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt\n",
-		    sc->sc_dev.dv_xname);
+		printf(", %s\n", intrstr);
 		goto no_interrupt;
 	}
+	if (*intrstr)
+		printf(", %s", intrstr);
 	sc->sc_ifp = &sc->sc_arpcom.ac_if;
 	sc->sc_cansleep = 1;
 
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index a7ea66defa7..fdf7b662f8f 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnw.c,v 1.14 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_cnw.c,v 1.15 2005/01/27 17:04:55 millert Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -315,7 +315,7 @@ cnw_enable(sc)
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 
 	sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
-	    cnw_intr, sc, "");
+	    cnw_intr, sc, sc->sc_dev.dv_xname);
 	if (sc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt handler\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 51dc7168bf7..75deb7c2649 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pcmcia.c,v 1.31 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.32 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -280,6 +280,7 @@ ep_pcmcia_attach(parent, self, aux)
 	struct ep_pcmcia_product *epp;
 	u_int8_t myla[ETHER_ADDR_LEN];
 	u_int8_t *enaddr = NULL;
+	const char *intrstr;
 	int i;
 
 	psc->sc_pf = pa->pf;
@@ -370,10 +371,11 @@ ep_pcmcia_attach(parent, self, aux)
 #endif
 
 	/* establish the interrupt. */
-	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr,
-	    sc, "");
-	if (sc->sc_ih == NULL)
-		printf(", couldn't establish interrupt");
+	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, epintr, sc,
+	    sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	printf(":");
 
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index e2c85e954b3..116e360266d 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.76 2004/12/12 07:05:49 deraadt Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.77 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -578,6 +578,7 @@ ne_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	const struct ne2000dev *ne_dev;
+	const char *intrstr;
 	int i;
 	u_int8_t myea[6], *enaddr;
 
@@ -762,9 +763,10 @@ again:
 
 	/* set up the interrupt */
 	psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, dp8390_intr,
-	    dsc, "");
-	if (psc->sc_ih == NULL)
-		printf("no irq");
+	    dsc, dsc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	printf("\n");
 
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 8850f1538c8..ecadf8e440b 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ray.c,v 1.25 2004/11/23 21:12:23 fgsch Exp $	*/
+/*	$OpenBSD: if_ray.c,v 1.26 2005/01/27 17:04:55 millert Exp $	*/
 /*	$NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $	*/
 
 /*
@@ -736,7 +736,7 @@ ray_enable(sc)
 
 	if ((error = ray_init(sc)) == 0) {
 		sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_NET,
-		    ray_intr, sc, "");
+		    ray_intr, sc, sc->sc_dev.dv_xname);
 		if (sc->sc_ih == NULL) {
 			ray_stop(sc);
 			return (EIO);
diff --git a/sys/dev/pcmcia/if_rln_pcmcia.c b/sys/dev/pcmcia/if_rln_pcmcia.c
index abec1002ce1..785f8791533 100644
--- a/sys/dev/pcmcia/if_rln_pcmcia.c
+++ b/sys/dev/pcmcia/if_rln_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rln_pcmcia.c,v 1.14 2002/11/19 18:36:18 jason Exp $	*/
+/*	$OpenBSD: if_rln_pcmcia.c,v 1.15 2005/01/27 17:04:56 millert Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
  *
@@ -138,6 +138,7 @@ rln_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	struct rln_pcmcia_product *rpp;
+	const char *intrstr;
 
 	psc->psc_pf = pa->pf;
 	cfe = SIMPLEQ_FIRST(&psc->psc_pf->cfe_head);
@@ -224,10 +225,10 @@ rln_pcmcia_attach(parent, self, aux)
 	 * responses, causes hard lock-ups.
 	 */
 	psc->psc_ih = pcmcia_intr_establish(psc->psc_pf, IPL_NET,
-		rlnintr_pcmcia, sc, "");
-	if (psc->psc_ih == NULL)
-		printf(": couldn't establish interrupt\n",
-		    sc->sc_dev.dv_xname);
+		rlnintr_pcmcia, sc, sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 	sc->sc_ih = NULL;
 
 #ifdef DIAGNOSTIC
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index e359e4738a5..2b38760538e 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_pcmcia.c,v 1.21 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_sm_pcmcia.c,v 1.22 2005/01/27 17:04:56 millert Exp $	*/
 /*	$NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $  */
 
 /*-
@@ -152,6 +152,7 @@ sm_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	u_int8_t myla[ETHER_ADDR_LEN], *enaddr = NULL;
+	const char *intrstr;
 
 	psc->sc_pf = pa->pf;
 	cfe = SIMPLEQ_FIRST(&pa->pf->cfe_head);
@@ -218,9 +219,10 @@ sm_pcmcia_attach(parent, self, aux)
 		printf(", unable to get Ethernet address\n");
 
 	psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET,
-	    smc91cxx_intr, sc, "");
-	if (psc->sc_ih == NULL)
-		printf(": couldn't establish interrupt\n");
+	    smc91cxx_intr, sc, sc->sc_dev.dv_xname);
+	intrstr = pcmcia_intr_string(psc->sc_pf, psc->sc_ih);
+	if (*intrstr)
+		printf(", %s", intrstr);
 
 	/* Perform generic initialization. */
 	smc91cxx_attach(sc, enaddr);
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index d2bfaee5bf6..241ed931bf2 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 03:32:21 millert Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.60 2005/01/27 17:04:56 millert Exp $ */
 /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
 
 /*
@@ -378,6 +378,7 @@ wi_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_function	*pf = pa->pf;
 	struct pcmcia_config_entry *cfe = SIMPLEQ_FIRST(&pf->cfe_head);
+	const char		*intrstr;
 	int			state = 0;
 
 	psc->sc_pf = pf;
@@ -423,7 +424,8 @@ wi_pcmcia_attach(parent, self, aux)
 		goto bad;
 	}
 
-	printf("\n");
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+	printf("%s%s\n", *intrstr ? ", " : "", intrstr);
 	if (wi_attach(sc, &wi_func_io) == 0)
 		return;
 
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index d65a26b390b..14b704daf9e 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.27 2004/05/12 06:35:11 tedu Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.28 2005/01/27 17:04:56 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -240,7 +240,7 @@ xe_pcmcia_attach(parent, self, aux)
 	struct pcmcia_mem_handle pcmh;
 	int ccr_window;
 	bus_addr_t ccr_offset;
-
+	const char *intrstr;
 
 	psc->sc_pf = pf;
 
@@ -384,13 +384,15 @@ xe_pcmcia_attach(parent, self, aux)
 	IFQ_SET_READY(&ifp->if_snd);
 
 	/* Establish the interrupt. */
-	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, xe_intr, sc, "");
+	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, xe_intr, sc,
+	    sc->sc_dev.dv_xname);
 	if (sc->sc_ih == NULL) {
 		printf(", couldn't establish interrupt\n");
 		goto bad;
 	}
-
-	printf(": address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr));
+	intrstr = pcmcia_intr_string(psc->sc_pf, sc->sc_ih);
+	printf("%s%s: address %s\n", *intrstr ? ", " : "", intrstr,
+	    ether_sprintf(sc->sc_arpcom.ac_enaddr));
 
 	/* Reset and initialize the card. */
 	xe_full_reset(sc);
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index a70da391142..98426340090 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_pcmcia.c,v 1.15 2005/01/11 22:07:58 drahn Exp $	*/
+/*	$OpenBSD: wdc_pcmcia.c,v 1.16 2005/01/27 17:04:56 millert Exp $	*/
 /*	$NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */
 
 /*-
@@ -258,6 +258,7 @@ wdc_pcmcia_attach(parent, self, aux)
 	struct pcmcia_attach_args *pa = aux;
 	struct pcmcia_config_entry *cfe;
 	struct wdc_pcmcia_product *wpp;
+	const char *intrstr;
 	int quirks;
 
 	sc->sc_pf = pa->pf;
@@ -373,9 +374,9 @@ wdc_pcmcia_attach(parent, self, aux)
 	/* Establish the interrupt handler. */
 	sc->sc_ih = pcmcia_intr_establish(sc->sc_pf, IPL_BIO, wdcintr,
 	    &sc->wdc_channel, sc->sc_wdcdev.sc_dev.dv_xname);
-	if (sc->sc_ih == NULL) {
-		printf("couldn't establish interrupt handler");
-	}
+	intrstr = pcmcia_intr_string(sc->sc_pf, sc->sc_ih);
+	if (*intrstr)
+		printf(": %s", intrstr);
 #endif
 
 	printf("\n");