diff options
| author | Nicolas Souchu <nsouch@FreeBSD.org> | 1998-11-04 22:09:17 +0000 |
|---|---|---|
| committer | Nicolas Souchu <nsouch@FreeBSD.org> | 1998-11-04 22:09:17 +0000 |
| commit | d3cf287966fc35bbe511bf6ec24e3396f8feeaa6 (patch) | |
| tree | fd589c6ab5111a8211fd349208a084d8e29b65fe | |
| parent | 804ec04759074c4d4cb977e3442266daef001428 (diff) | |
| download | src-d3cf287966fc35bbe511bf6ec24e3396f8feeaa6.tar.gz src-d3cf287966fc35bbe511bf6ec24e3396f8feeaa6.zip | |
iicbus probe and attach deferred until root_bus_configure() call.
Notes
Notes:
svn path=/head/; revision=40915
| -rw-r--r-- | sys/dev/pcf/pcf.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/pcf.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c index 0d08b3cfa6e7..73630776cbba 100644 --- a/sys/dev/pcf/pcf.c +++ b/sys/dev/pcf/pcf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pcf.c,v 1.3 1998/10/31 11:37:09 nsouch Exp $ + * $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $ * */ #include <sys/param.h> @@ -168,7 +168,6 @@ pcfprobe_isa(struct isa_device *dvp) /* XXX add the pcf device to the root_bus until isa bus exists */ pcfdev = device_add_child(root_bus, "pcf", pcf->pcf_unit, NULL); - device_probe_and_attach(pcfdev); if (!pcfdev) goto error; @@ -217,9 +216,6 @@ pcf_attach(device_t pcfdev) pcf->iicbus = iicbus_alloc_bus(pcfdev); - if (!pcf->iicbus) - return (EINVAL); - /* probe and attach the iicbus */ device_probe_and_attach(pcf->iicbus); diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c index 0d08b3cfa6e7..73630776cbba 100644 --- a/sys/i386/isa/pcf.c +++ b/sys/i386/isa/pcf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pcf.c,v 1.3 1998/10/31 11:37:09 nsouch Exp $ + * $Id: pcf.c,v 1.4 1998/10/31 14:23:09 peter Exp $ * */ #include <sys/param.h> @@ -168,7 +168,6 @@ pcfprobe_isa(struct isa_device *dvp) /* XXX add the pcf device to the root_bus until isa bus exists */ pcfdev = device_add_child(root_bus, "pcf", pcf->pcf_unit, NULL); - device_probe_and_attach(pcfdev); if (!pcfdev) goto error; @@ -217,9 +216,6 @@ pcf_attach(device_t pcfdev) pcf->iicbus = iicbus_alloc_bus(pcfdev); - if (!pcf->iicbus) - return (EINVAL); - /* probe and attach the iicbus */ device_probe_and_attach(pcf->iicbus); |