[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] hw/ppc/e500{, plat}: Drop redundant checks for presence of p
From: |
Bernhard Beschow |
Subject: |
[PATCH 2/4] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus |
Date: |
Wed, 25 Jan 2023 14:00:22 +0100 |
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(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7239993acc..48288c0b41 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -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);
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 44bf874b0f..3032bd3f6d 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -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));
}
}
--
2.39.1
- [PATCH 0/4] E500 cleanups and enhancements, Bernhard Beschow, 2023/01/25
- [PATCH 3/4] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec(), Bernhard Beschow, 2023/01/25
- [PATCH 1/4] hw/ppc: Set machine->fdt in e500 machines, Bernhard Beschow, 2023/01/25
- [PATCH 2/4] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus,
Bernhard Beschow <=
- [PATCH 4/4] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space, Bernhard Beschow, 2023/01/25
- Re: [PATCH 0/4] E500 cleanups and enhancements, Daniel Henrique Barboza, 2023/01/28