From d3cf287966fc35bbe511bf6ec24e3396f8feeaa6 Mon Sep 17 00:00:00 2001 From: Nicolas Souchu Date: Wed, 4 Nov 1998 22:09:17 +0000 Subject: [PATCH] iicbus probe and attach deferred until root_bus_configure() call. --- sys/dev/pcf/pcf.c | 6 +----- 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 0d08b3cfa6e..73630776cbb 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 @@ -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 0d08b3cfa6e..73630776cbb 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 @@ -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);