remove last traces of __BROKEN_INDIRECT_CONFIG.

Thanks to aanriot@ and Michael Knudsen for checking that alpha/i386/macppc
kernels still compile.

8 files changed, 8 insertions, 84 deletions

diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index cafb8d75310..4854c58c150 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio.c,v 1.47 2005/11/21 18:16:38 millert Exp $	*/
+/*	$OpenBSD: audio.c,v 1.48 2006/01/02 05:21:37 brad Exp $	*/
 /*	$NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $	*/
 
 /*
@@ -145,12 +145,7 @@ void	audio_free_ring(struct audio_softc *, struct audio_ringbuffer *);
 
 int	audioprint(void *, const char *);
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	audioprobe(struct device *, void *, void *);
-#else
-int	audioprobe(struct device *, struct cfdata *, void *);
-#endif
 void	audioattach(struct device *, struct device *, void *);
 int	audiodetach(struct device *, int);
 int	audioactivate(struct device *, enum devact);
@@ -216,11 +211,7 @@ struct filterops audioread_filtops =
 int
 audioprobe(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct audio_attach_args *sa = aux;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 5336ebd04d1..25e3f6cb2e5 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.34 2004/05/01 23:23:13 millert Exp $ */
+/*	$OpenBSD: mcd.c,v 1.35 2006/01/02 05:21:40 brad Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -186,12 +186,7 @@ int mcd_getqchan(struct mcd_softc *, union mcd_qchninfo *, int);
 int mcd_setlock(struct mcd_softc *, int);
 
 int mcd_find(bus_space_tag_t, bus_space_handle_t, struct mcd_softc *);
-#define __BROKEN_INDIRECT_CONFIG
-#ifdef __BROKEN_INDIRECT_CONFIG
 int mcdprobe(struct device *, void *, void *);
-#else
-int mcdprobe(struct device *, struct cfdata *, void *);
-#endif
 void mcdattach(struct device *, struct device *, void *);
 
 struct cfattach mcd_ca = {
@@ -895,11 +890,7 @@ mcd_find(iot, ioh, sc)
 int
 mcdprobe(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
index a0a4d61965c..e3458d58d6e 100644
--- a/sys/dev/isa/midi_pcppi.c
+++ b/sys/dev/isa/midi_pcppi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midi_pcppi.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
+/*	$OpenBSD: midi_pcppi.c,v 1.5 2006/01/02 05:21:40 brad Exp $	*/
 /*	$NetBSD: midi_pcppi.c,v 1.4 1998/11/25 22:17:06 augustss Exp $	*/
 
 /*
@@ -63,12 +63,7 @@ struct midi_pcppi_softc {
 	midisyn sc_midisyn;
 };
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	midi_pcppi_match(struct device *, void *, void *);
-#else
-int	midi_pcppi_match(struct device *, struct cfdata *, void *);
-#endif
 void	midi_pcppi_attach(struct device *, struct device *, void *);
 
 void	midi_pcppi_on(midisyn *, u_int32_t, u_int32_t, u_int32_t);
@@ -99,11 +94,7 @@ int midi_pcppi_attached = 0;	/* Not very nice */
 int
 midi_pcppi_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	return (!midi_pcppi_attached);
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
index b0dd8ccf474..bf8d38ba907 100644
--- a/sys/dev/isa/opl_sb.c
+++ b/sys/dev/isa/opl_sb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opl_sb.c,v 1.4 2005/11/21 18:16:40 millert Exp $	*/
+/*	$OpenBSD: opl_sb.c,v 1.5 2006/01/02 05:21:40 brad Exp $	*/
 /*	$NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 augustss Exp $	*/
 
 /*
@@ -59,12 +59,7 @@
 #include <dev/isa/isavar.h>
 #include <dev/isa/sbdspvar.h>
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	opl_sb_match(struct device *, void *, void *);
-#else
-int	opl_sb_match(struct device *, struct cfdata *, void *);
-#endif
 void	opl_sb_attach(struct device *, struct device *, void *);
 
 struct cfattach opl_sb_ca = {
@@ -74,11 +69,7 @@ struct cfattach opl_sb_ca = {
 int
 opl_sb_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct audio_attach_args *aa = (struct audio_attach_args *)aux;
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index 85c9ed4cdbb..41c57e974e6 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcppi.c,v 1.5 2002/03/14 03:16:05 millert Exp $ */
+/* $OpenBSD: pcppi.c,v 1.6 2006/01/02 05:21:40 brad Exp $ */
 /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
 
 /*
@@ -65,12 +65,7 @@ struct pcppi_softc {
 	int sc_timeout;
 };
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	pcppi_match(struct device *, void *, void *);
-#else
-int	pcppi_match(struct device *, struct cfdata *, void *);
-#endif
 void	pcppi_attach(struct device *, struct device *, void *);
 
 struct cfattach pcppi_ca = {
@@ -88,11 +83,7 @@ static void pcppi_bell_stop(void *);
 int
 pcppi_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 999e9c6c7dd..6fad97cbed1 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb_isa.c,v 1.7 2003/04/27 11:22:53 ho Exp $	*/
+/*	$OpenBSD: sb_isa.c,v 1.8 2006/01/02 05:21:40 brad Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $	*/
 
 /*
@@ -60,12 +60,7 @@
 
 static	int sbfind(struct device *, struct sbdsp_softc *, struct isa_attach_args *);
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	sb_isa_match(struct device *, void *, void *);
-#else
-int	sb_isa_match(struct device *, struct cfdata *, void *);
-#endif
 void	sb_isa_attach(struct device *, struct device *, void *);
 
 struct cfattach sb_isa_ca = {
@@ -82,21 +77,13 @@ struct cfattach sb_isa_ca = {
 int
 sb_isa_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct sbdsp_softc probesc, *sc = &probesc;
 
 	bzero(sc, sizeof *sc);
-#ifdef __BROKEN_INDIRECT_CONFIG
 	sc->sc_dev.dv_cfdata = ((struct device *)match)->dv_cfdata;
-#else
-	sc->sc_dev.dv_cfdata = match;
-#endif
 	strlcpy(sc->sc_dev.dv_xname, "sb", sizeof sc->sc_dev.dv_xname);
 	return sbfind(parent, sc, aux);
 }
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 9abf79210e7..9834a6de288 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spkr.c,v 1.7 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: spkr.c,v 1.8 2006/01/02 05:21:40 brad Exp $	*/
 /*	$NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $	*/
 
 /*
@@ -60,12 +60,7 @@
 
 cdev_decl(spkr);
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int spkrprobe(struct device *, void *, void *);
-#else
-int spkrprobe(struct device *, struct cfdata *, void *);
-#endif
 void spkrattach(struct device *, struct device *, void *);
 
 struct spkr_softc {
@@ -409,11 +404,7 @@ static int spkr_attached = 0;
 int
 spkrprobe (parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	return (!spkr_attached);
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index 1a4410150e5..83a52e207c3 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wss_isa.c,v 1.4 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: wss_isa.c,v 1.5 2006/01/02 05:21:40 brad Exp $	*/
 /*	$NetBSD: wss_isa.c,v 1.1 1998/01/19 22:18:24 augustss Exp $	*/
 
 /*
@@ -95,22 +95,13 @@ struct cfdriver wss_cd = {
 int
 wss_isa_probe(parent, match, aux)
     struct device *parent;
-#define __BROKEN_INDIRECT_CONFIG
-#ifdef __BROKEN_INDIRECT_CONFIG
     void *match;
-#else
-    struct cfdata *match;
-#endif
     void *aux;
 {
     struct wss_softc probesc, *sc = &probesc;
 
     bzero(sc, sizeof *sc);
-#ifdef __BROKEN_INDIRECT_CONFIG
     sc->sc_dev.dv_cfdata = ((struct device *)match)->dv_cfdata;
-#else
-    sc->sc_dev.dv_cfdata = match;
-#endif
     if (wssfind(parent, sc, aux)) {
         bus_space_unmap(sc->sc_iot, sc->sc_ioh, WSS_CODEC);
         ad1848_unmap(&sc->sc_ad1848);