d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iicbus probe and attach deferred until root_bus_configure() call.

Browse Source
This commit is contained in:
Nicolas Souchu 1998-11-04 22:09:17 +00:00
parent 804ec04759
commit d3cf287966
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pcf/pcf.c
View File

@ -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);

6
sys/i386/isa/pcf.c
View File

@ -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);