Back out my change to pass in sc_dev.dv_xname to pcmcia_intr_establish().

It screws up printing in dmesg and doesn't actually help anything
since interupts in "vmstat -i" show up as pcmcia*, not wi* or an*.

2 files changed, 4 insertions, 6 deletions

diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index 3cccf4f0152..e4e761b2233 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.9 2002/06/09 22:34:16 millert Exp $	*/
+/*	$OpenBSD: if_an_pcmcia.c,v 1.10 2002/06/25 15:13:09 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -131,8 +131,7 @@ 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, sc->sc_dev.dv_xname);
+	sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, an_intr, sc, "");
 	if (sc->sc_ih == NULL)
 		printf("no irq");
 
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 6f9be168f23..04b7e6c2d2f 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.35 2002/06/22 22:10:38 fgsch Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.36 2002/06/25 15:13:09 millert Exp $ */
 /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
 
 /*
@@ -375,8 +375,7 @@ wi_pcmcia_attach(parent, self, aux)
 	CSR_WRITE_2(sc, WI_EVENT_ACK, 0xffff);
 
 	/* Establish the interrupt. */
-	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc,
-	    sc->sc_dev.dv_xname);
+	sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, "");
 	if (sc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt\n",
 		    sc->sc_dev.dv_xname);