aboutsummaryrefslogtreecommitdiff
path: root/sys/x86
diff options
context:
space:
mode:
authorRoger Pau Monné <royger@FreeBSD.org>2018-02-16 18:04:27 +0000
committerRoger Pau Monné <royger@FreeBSD.org>2018-02-16 18:04:27 +0000
commitc2bddfdc5139587a9ade391fecb452c40532f302 (patch)
tree93450a30cc566a9f684beb35f79e7cd79b60c341 /sys/x86
parenta72c9dc53f95ae8ef2f32a39f70670df745996cb (diff)
downloadsrc-c2bddfdc5139587a9ade391fecb452c40532f302.tar.gz
src-c2bddfdc5139587a9ade391fecb452c40532f302.zip
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
Notes
Notes: svn path=/head/; revision=329389
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/xen/xenpv.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/x86/xen/xenpv.c b/sys/x86/xen/xenpv.c
index 182edf8ee7ec..587ced913e0a 100644
--- a/sys/x86/xen/xenpv.c
+++ b/sys/x86/xen/xenpv.c
@@ -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);
-
- 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_probe(dev);
+ if (error)
+ return (error);
+
+ error = bus_generic_attach(dev);
- return (0);
+ return (error);
}
static struct resource *