[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus |
Date: |
Sun, 5 Feb 2023 07:04:39 -0300 |
From: Bernhard Beschow <shentey@gmail.com>
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>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-3-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@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
- [PULL 00/16] ppc queue, Daniel Henrique Barboza, 2023/02/05
- [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec(), Daniel Henrique Barboza, 2023/02/05
- [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation, Daniel Henrique Barboza, 2023/02/05
- [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary, Daniel Henrique Barboza, 2023/02/05
- [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines, Daniel Henrique Barboza, 2023/02/05
- [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus,
Daniel Henrique Barboza <=
- [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py, Daniel Henrique Barboza, 2023/02/05
- [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn, Daniel Henrique Barboza, 2023/02/05
- [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer, Daniel Henrique Barboza, 2023/02/05
- [PULL 16/16] hw/display/sm501: Code style fix, Daniel Henrique Barboza, 2023/02/05
- [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment, Daniel Henrique Barboza, 2023/02/05
- [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name, Daniel Henrique Barboza, 2023/02/05
- [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions, Daniel Henrique Barboza, 2023/02/05
- [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space, Daniel Henrique Barboza, 2023/02/05
- [PULL 11/16] ppc/pnv/pci: Update PHB5 version register, Daniel Henrique Barboza, 2023/02/05
- [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure, Daniel Henrique Barboza, 2023/02/05