svn commit: r329389 - head/sys/x86/xen

[Roger Pau Monné]

Author: royger
Date: Fri Feb 16 18:04:27 2018
New Revision: 329389
URL: https://svnweb.freebsd.org/changeset/base/329389

Log:
  xen/pv: remove the attach of the ISA bus from the Xen PV bus
  
  There's no need to attach the ISA bus from the Xen PV one.
  
  Sponsored by:           Citrix Systems R&D

Modified:
  head/sys/x86/xen/xenpv.c

Modified: head/sys/x86/xen/xenpv.c
==============================================================================
--- head/sys/x86/xen/xenpv.c	Fri Feb 16 17:50:06 2018	(r329388)
+++ head/sys/x86/xen/xenpv.c	Fri Feb 16 18:04:27 2018	(r329389)
@@ -93,24 +93,20 @@ xenpv_probe(device_t dev)
 static int
 xenpv_attach(device_t dev)
 {
-	device_t child;
+	int error;
 
 	/*
 	 * Let our child drivers identify any child devices that they
 	 * can find.  Once that is done attach any devices that we
 	 * found.
 	 */
-	bus_generic_probe(dev);
-	bus_generic_attach(dev);
+	error = bus_generic_probe(dev);
+	if (error)
+		return (error);
 
-	if (!devclass_get_device(devclass_find("isa"), 0)) {
-		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
-		if (child == NULL)
-			panic("Failed to attach ISA bus.");
-		device_probe_and_attach(child);
-	}
+	error = bus_generic_attach(dev);
 
-	return (0);
+	return (error);
 }
 
 static struct resource *