attach softraid to the root of the device tree in a machine independant

way, rather than requiring some glue in each machines mainbus probe.

it is still commented out.

based on a discussion with miod@ ok marco@ deraadt@

2 files changed, 1 insertions, 11 deletions

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index d3f8bed46b4..fdc9f4cd64d 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -122,12 +122,6 @@ struct scsi_device sr_dev = {
 int
 sr_probe(struct device *parent, void *match, void *aux)
 {
-	struct sr_attach_args	*maa = aux;
-	struct cfdata		*cf = match;
-
-	if (strcmp(maa->maa_name, cf->cf_driver->cd_name))
-		return (0);
-
 	return (1);
 }
 
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index 664d37dea53..b87e6eaea82 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.1 2007/03/19 03:02:08 marco Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.2 2007/03/19 14:33:28 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <sro@peereboom.us>
  *
@@ -253,10 +253,6 @@ struct sr_softc {
 	struct sr_discipline	*sc_dis[SR_MAXSCSIBUS]; /* scsibus is u_int8_t */
 };
 
-struct sr_attach_args {
-	char 			*maa_name;
-};
-
 int		sr_probe(struct device *, void *, void *);
 void		sr_attach(struct device *, struct device *, void *);
 int		sr_detach(struct device *, int);