@@ -643,9 +643,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
}
g_free(soc);
- if (pms->pbus_dev) {
- platform_bus_create_devtree(pms, fdt, mpic);
- }
+ platform_bus_create_devtree(pms, fdt, mpic);
+
g_free(mpic);
pmc->fixup_devtree(fdt);
@@ -46,13 +46,10 @@ static void e500plat_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
PPCE500MachineState *pms = PPCE500_MACHINE(hotplug_dev);
+ MachineClass *mc = MACHINE_GET_CLASS(pms);
- if (pms->pbus_dev) {
- MachineClass *mc = MACHINE_GET_CLASS(pms);
-
- if (device_is_dynamic_sysbus(mc, dev)) {
- platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
- }
+ if (device_is_dynamic_sysbus(mc, dev)) {
+ platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
}
}
This is a follow-up on commit 47a0b1dff7e9 'hw/ppc/mpc8544ds: Add platform bus': Both mpc85xx boards now have a platform bus unconditionally. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/ppc/e500.c | 5 ++--- hw/ppc/e500plat.c | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-)