make all intr_establish take the same last arg for name

14 files changed, 34 insertions, 34 deletions

diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c
index 932ba6cac42..9ea23a6e156 100644
--- a/sys/arch/hppa/dev/cpu.c
+++ b/sys/arch/hppa/dev/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.21 2003/03/29 00:52:45 mickey Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.22 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Michael Shalayeff
@@ -190,7 +190,7 @@ cpuattach(parent, self, aux)
 	/* sanity against lusers amongst config editors */
 	if (ca->ca_irq == 31)
 		sc->sc_ih = cpu_intr_establish(IPL_CLOCK, ca->ca_irq,
-		    cpu_hardclock, NULL /*frame*/, &sc->sc_dev);
+		    cpu_hardclock, NULL /*frame*/, sc->sc_dev.dv_xname);
 	else
 		printf ("%s: bad irq %d\n", sc->sc_dev.dv_xname, ca->ca_irq);
 }
diff --git a/sys/arch/hppa/dev/mongoose.c b/sys/arch/hppa/dev/mongoose.c
index 0dda370bd10..87af6fb4aa9 100644
--- a/sys/arch/hppa/dev/mongoose.c
+++ b/sys/arch/hppa/dev/mongoose.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mongoose.c,v 1.12 2003/05/11 19:41:09 deraadt Exp $	*/
+/*	$OpenBSD: mongoose.c,v 1.13 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
@@ -251,7 +251,7 @@ mg_isa_attach_hook(struct device *parent, struct device *self,
 
 void *
 mg_intr_establish(void *v, int irq, int type, int pri,
-	int (*handler)(void *), void *arg, char *name)
+	int (*handler)(void *), void *arg, const char *name)
 {
 	struct hppa_isa_iv *iv;
 	struct mongoose_softc *sc = v;
@@ -652,7 +652,7 @@ mgattach(parent, self, aux)
 
 	/* attach interrupt */
 	sc->sc_ih = cpu_intr_establish(IPL_HIGH, ca->ca_irq,
-				       mg_intr, sc, &sc->sc_dev);
+				       mg_intr, sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/arch/hppa/gsc/com_gsc.c b/sys/arch/hppa/gsc/com_gsc.c
index 0fcf2f51e55..876bb52acb2 100644
--- a/sys/arch/hppa/gsc/com_gsc.c
+++ b/sys/arch/hppa/gsc/com_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_gsc.c,v 1.15 2003/01/25 07:22:01 jason Exp $	*/
+/*	$OpenBSD: com_gsc.c,v 1.16 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Michael Shalayeff
@@ -102,6 +102,6 @@ com_gsc_attach(parent, self, aux)
 	com_attach_subr(sc);
 
 	sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
-				       ga->ga_irq, comintr, sc, &sc->sc_dev);
+	    ga->ga_irq, comintr, sc, sc->sc_dev.dv_xname);
 }
 
diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c
index d1edc0142f7..e6c51274e81 100644
--- a/sys/arch/hppa/gsc/gscbus.c
+++ b/sys/arch/hppa/gsc/gscbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gscbus.c,v 1.22 2003/07/30 21:50:38 mickey Exp $	*/
+/*	$OpenBSD: gscbus.c,v 1.23 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -108,7 +108,7 @@ gscattach(parent, self, aux)
 	printf ("\n");
 
 	sc->sc_ih = cpu_intr_establish(IPL_NESTED, ga->ga_irq,
-	    gsc_intr, (void *)sc->sc_ic->gsc_base, &sc->sc_dev);
+	    gsc_intr, (void *)sc->sc_ic->gsc_base, sc->sc_dev.dv_xname);
 
 	/* DMA guts */
 	sc->sc_dmatag._cookie = sc;
@@ -144,18 +144,18 @@ gscprint(aux, pnp)
 }
 
 void *
-gsc_intr_establish(sc, pri, irq, handler, arg, dv)
+gsc_intr_establish(sc, pri, irq, handler, arg, name)
 	struct gsc_softc *sc;
 	int pri;
 	int irq;
 	int (*handler)(void *v);
 	void *arg;
-	struct device *dv;
+	const char *name;
 {
 	volatile u_int32_t *r = sc->sc_ic->gsc_base;
 	void *iv;
 
-	if ((iv = cpu_intr_map(sc->sc_ih, pri, irq, handler, arg, dv)))
+	if ((iv = cpu_intr_map(sc->sc_ih, pri, irq, handler, arg, name)))
 		r[1] |= (1 << irq);
 	else {
 #ifdef GSCDEBUG
diff --git a/sys/arch/hppa/gsc/gscbusvar.h b/sys/arch/hppa/gsc/gscbusvar.h
index 31715e01ace..b361d090bf6 100644
--- a/sys/arch/hppa/gsc/gscbusvar.h
+++ b/sys/arch/hppa/gsc/gscbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gscbusvar.h,v 1.10 2003/04/07 17:38:51 mickey Exp $	*/
+/*	$OpenBSD: gscbusvar.h,v 1.11 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -60,7 +60,7 @@ struct gsc_softc {
 };
 
 void *gsc_intr_establish(struct gsc_softc *sc, int pri, int irq,
-    int (*handler)(void *v), void *arg, struct device *name);
+    int (*handler)(void *v), void *arg, const char *name);
 void gsc_intr_disestablish(struct gsc_softc *sc, void *v);
 int gsc_intr(void *);
 
diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c
index f426c96ac80..e7ab1670d77 100644
--- a/sys/arch/hppa/gsc/harmony.c
+++ b/sys/arch/hppa/gsc/harmony.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: harmony.c,v 1.19 2003/06/02 19:54:29 jason Exp $	*/
+/*	$OpenBSD: harmony.c,v 1.20 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 2003 Jason L. Wright (jason@thought.net)
@@ -224,7 +224,7 @@ harmony_attach(parent, self, aux)
 	    PLAYBACK_EMPTYS * HARMONY_BUFSIZE, BUS_DMASYNC_PREWRITE);
 
 	(void)gsc_intr_establish((struct gsc_softc *)parent,
-	    IPL_AUDIO, ga->ga_irq, harmony_intr, sc, &sc->sc_dv);
+	    IPL_AUDIO, ga->ga_irq, harmony_intr, sc, sc->sc_dv.dv_xname);
 
 	/* set defaults */
 	sc->sc_in_port = HARMONY_IN_LINE;
diff --git a/sys/arch/hppa/gsc/hil_gsc.c b/sys/arch/hppa/gsc/hil_gsc.c
index d5ab2bdcd44..dad5d3735d2 100644
--- a/sys/arch/hppa/gsc/hil_gsc.c
+++ b/sys/arch/hppa/gsc/hil_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hil_gsc.c,v 1.2 2003/02/15 23:42:45 miod Exp $	*/
+/*	$OpenBSD: hil_gsc.c,v 1.3 2003/08/07 19:47:33 mickey Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -82,7 +82,7 @@ hil_gsc_attach(struct device *parent, struct device *self, void *aux)
 	hil_attach(sc, hil_is_console);
 
 	gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
-	    ga->ga_irq, hil_intr, sc, &sc->sc_dev);
+	    ga->ga_irq, hil_intr, sc, sc->sc_dev.dv_xname);
 
 	startuphook_establish(hil_attach_deferred, sc);
 }
diff --git a/sys/arch/hppa/gsc/if_ie_gsc.c b/sys/arch/hppa/gsc/if_ie_gsc.c
index 633c62b91c0..b8bf43267a7 100644
--- a/sys/arch/hppa/gsc/if_ie_gsc.c
+++ b/sys/arch/hppa/gsc/if_ie_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie_gsc.c,v 1.20 2003/08/03 21:28:24 mickey Exp $	*/
+/*	$OpenBSD: if_ie_gsc.c,v 1.21 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
@@ -394,5 +394,5 @@ ie_gsc_attach(parent, self, aux)
 		      ie_gsc_media, IE_NMEDIA, ie_gsc_media[0]);
 
 	sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_NET,
-	    ga->ga_irq, i82596_intr, sc, &sc->sc_dev);
+	    ga->ga_irq, i82596_intr, sc, sc->sc_dev.dv_xname);
 }
diff --git a/sys/arch/hppa/gsc/lpt_gsc.c b/sys/arch/hppa/gsc/lpt_gsc.c
index c6640b5d58a..9e3ab9cd821 100644
--- a/sys/arch/hppa/gsc/lpt_gsc.c
+++ b/sys/arch/hppa/gsc/lpt_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_gsc.c,v 1.8 2003/01/25 07:22:01 jason Exp $	*/
+/*	$OpenBSD: lpt_gsc.c,v 1.9 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -171,5 +171,5 @@ lpt_gsc_attach(parent, self, aux)
 	lpt_attach_common(sc);
 
 	sc->sc_ih = gsc_intr_establish((struct gsc_softc *)parent, IPL_TTY,
-				       ga->ga_irq, lptintr, sc, &sc->sc_dev);
+	    ga->ga_irq, lptintr, sc, sc->sc_dev.dv_xname);
 }
diff --git a/sys/arch/hppa/gsc/osiop_gsc.c b/sys/arch/hppa/gsc/osiop_gsc.c
index c03bdcce33a..01dd188569a 100644
--- a/sys/arch/hppa/gsc/osiop_gsc.c
+++ b/sys/arch/hppa/gsc/osiop_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop_gsc.c,v 1.6 2003/05/19 21:32:18 krw Exp $	*/
+/*	$OpenBSD: osiop_gsc.c,v 1.7 2003/08/07 19:47:33 mickey Exp $	*/
 /*	$NetBSD: osiop_gsc.c,v 1.6 2002/10/02 05:17:50 thorpej Exp $	*/
 
 /*
@@ -159,7 +159,7 @@ osiop_gsc_attach(parent, self, aux)
 	osiop_attach(sc);
 
 	(void)gsc_intr_establish((struct gsc_softc *)parent, IPL_BIO,
-				 ga->ga_irq, osiop_gsc_intr, sc, &sc->sc_dev);
+	    ga->ga_irq, osiop_gsc_intr, sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/arch/hppa/hppa/intr.c b/sys/arch/hppa/hppa/intr.c
index 636f62deacf..8ee5b60753a 100644
--- a/sys/arch/hppa/hppa/intr.c
+++ b/sys/arch/hppa/hppa/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.10 2003/08/05 02:04:58 mickey Exp $	*/
+/*	$OpenBSD: intr.c,v 1.11 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -156,7 +156,7 @@ cpu_intr_init(void)
 
 void *
 cpu_intr_map(void *v, int pri, int irq, int (*handler)(void *), void *arg,
-    struct device *dv)
+    const char *name)
 {
 	struct hppa_iv *iv, *pv = v, *ivb = pv->next;
 
@@ -188,7 +188,7 @@ cpu_intr_map(void *v, int pri, int irq, int (*handler)(void *), void *arg,
 
 void *
 cpu_intr_establish(int pri, int irq, int (*handler)(void *), void *arg,
-    struct device *dv)
+    const char *name)
 {
 	struct hppa_iv *iv, *ev;
 
diff --git a/sys/arch/hppa/include/autoconf.h b/sys/arch/hppa/include/autoconf.h
index 6a7e7bc32ce..1a4d337feb4 100644
--- a/sys/arch/hppa/include/autoconf.h
+++ b/sys/arch/hppa/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.18 2003/03/29 01:08:15 mickey Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.19 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -77,9 +77,9 @@ void	pdc_scanbus(struct device *, struct confargs *, int);
 int	mbprint(void *, const char *);
 int	mbsubmatch(struct device *, void *, void *);
 void	*cpu_intr_map(void *v, int pri, int irq, int (*handler)(void *),
-	    void *arg, struct device *dv);
+	    void *arg, const char *name);
 void	*cpu_intr_establish(int pri, int irq, int (*handler)(void *),
-	    void *arg, struct device *dv);
+	    void *arg, const char *name);
 int	clock_intr(void *);
 
 void	dumpconf(void);
diff --git a/sys/arch/hppa/include/eisa_machdep.h b/sys/arch/hppa/include/eisa_machdep.h
index 3cf39603577..be5d3d7626d 100644
--- a/sys/arch/hppa/include/eisa_machdep.h
+++ b/sys/arch/hppa/include/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.1 2002/12/20 01:56:32 mickey Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.2 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -47,7 +47,7 @@ struct hppa_eisa_chipset {
 	int	(*ec_intr_map)(void *, u_int, int *);
 	const char *(*ec_intr_string)(void *, int);
 	void	*(*ec_intr_establish)(void *, int, int, int,
-				      int (*)(void *), void *, char *);
+				      int (*)(void *), void *, const char *);
 	void	(*ec_intr_disestablish)(void *, void *);
 };
 
diff --git a/sys/arch/hppa/include/isa_machdep.h b/sys/arch/hppa/include/isa_machdep.h
index 7df071e5675..4320225f1c3 100644
--- a/sys/arch/hppa/include/isa_machdep.h
+++ b/sys/arch/hppa/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.1 2002/12/20 01:56:32 mickey Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.2 2003/08/07 19:47:33 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -43,7 +43,7 @@ struct hppa_isa_chipset {
 	void	(*ic_attach_hook)(struct device *, struct device *,
 		    struct isabus_attach_args *);
 	void	*(*ic_intr_establish)(void *, int, int, int,
-		    int (*)(void *), void *, char *);
+		    int (*)(void *), void *, const char *);
 	void	(*ic_intr_disestablish)(void *, void *);
 	int	(*ic_intr_check)(void *, int, int);
 };