[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 39/39] sysbus: Drop useless OBJECT() in sysbus_init_child_obj(
|
From: |
Markus Armbruster |
|
Subject: |
[PATCH v3 39/39] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls |
|
Date: |
Tue, 9 Jun 2020 18:39:32 +0200 |
OBJECT(child) expands to ((Object *)(child)). sysbus_init_child_obj()
parameter @child is void *. Pass child instead of OBJECT(child).
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/arm/allwinner-a10.c | 4 ++--
hw/arm/aspeed_ast2600.c | 39 +++++++++++++++++----------------------
hw/arm/aspeed_soc.c | 35 +++++++++++++++--------------------
hw/arm/nrf51_soc.c | 2 +-
hw/mips/boston.c | 4 ++--
hw/mips/malta.c | 2 +-
6 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 49c51463e1..64449416de 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -59,9 +59,9 @@ static void aw_a10_init(Object *obj)
int i;
for (i = 0; i < AW_A10_NUM_USB; i++) {
- sysbus_init_child_obj(obj, "ehci[*]", OBJECT(&s->ehci[i]),
+ sysbus_init_child_obj(obj, "ehci[*]", &s->ehci[i],
sizeof(s->ehci[i]), TYPE_PLATFORM_EHCI);
- sysbus_init_child_obj(obj, "ohci[*]", OBJECT(&s->ohci[i]),
+ sysbus_init_child_obj(obj, "ohci[*]", &s->ohci[i],
sizeof(s->ohci[i]), TYPE_SYSBUS_OHCI);
}
}
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index beb688fd8f..10e92643c1 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -131,8 +131,7 @@ static void aspeed_soc_ast2600_init(Object *obj)
}
snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname);
- sysbus_init_child_obj(obj, "scu", OBJECT(&s->scu), sizeof(s->scu),
- typename);
+ sysbus_init_child_obj(obj, "scu", &s->scu, sizeof(s->scu), typename);
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",
sc->silicon_rev);
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
@@ -145,36 +144,33 @@ static void aspeed_soc_ast2600_init(Object *obj)
sysbus_init_child_obj(obj, "a7mpcore", &s->a7mpcore,
sizeof(s->a7mpcore), TYPE_A15MPCORE_PRIV);
- sysbus_init_child_obj(obj, "rtc", OBJECT(&s->rtc), sizeof(s->rtc),
+ sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),
TYPE_ASPEED_RTC);
snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
- sysbus_init_child_obj(obj, "timerctrl", OBJECT(&s->timerctrl),
+ sysbus_init_child_obj(obj, "timerctrl", &s->timerctrl,
sizeof(s->timerctrl), typename);
snprintf(typename, sizeof(typename), "aspeed.i2c-%s", socname);
- sysbus_init_child_obj(obj, "i2c", OBJECT(&s->i2c), sizeof(s->i2c),
- typename);
+ sysbus_init_child_obj(obj, "i2c", &s->i2c, sizeof(s->i2c), typename);
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
- sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
- typename);
+ sysbus_init_child_obj(obj, "fmc", &s->fmc, sizeof(s->fmc), typename);
object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
for (i = 0; i < sc->spis_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1,
socname);
- sysbus_init_child_obj(obj, "spi[*]", OBJECT(&s->spi[i]),
+ sysbus_init_child_obj(obj, "spi[*]", &s->spi[i],
sizeof(s->spi[i]), typename);
}
for (i = 0; i < sc->ehcis_num; i++) {
- sysbus_init_child_obj(obj, "ehci[*]", OBJECT(&s->ehci[i]),
+ sysbus_init_child_obj(obj, "ehci[*]", &s->ehci[i],
sizeof(s->ehci[i]), TYPE_PLATFORM_EHCI);
}
snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname);
- sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
- typename);
+ sysbus_init_child_obj(obj, "sdmc", &s->sdmc, sizeof(s->sdmc), typename);
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
"ram-size");
object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
@@ -182,30 +178,29 @@ static void aspeed_soc_ast2600_init(Object *obj)
for (i = 0; i < sc->wdts_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);
- sysbus_init_child_obj(obj, "wdt[*]", OBJECT(&s->wdt[i]),
+ sysbus_init_child_obj(obj, "wdt[*]", &s->wdt[i],
sizeof(s->wdt[i]), typename);
}
for (i = 0; i < sc->macs_num; i++) {
- sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[i]),
+ sysbus_init_child_obj(obj, "ftgmac100[*]", &s->ftgmac100[i],
sizeof(s->ftgmac100[i]), TYPE_FTGMAC100);
sysbus_init_child_obj(obj, "mii[*]", &s->mii[i], sizeof(s->mii[i]),
TYPE_ASPEED_MII);
}
- sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
+ sysbus_init_child_obj(obj, "xdma", &s->xdma, sizeof(s->xdma),
TYPE_ASPEED_XDMA);
snprintf(typename, sizeof(typename), "aspeed.gpio-%s", socname);
- sysbus_init_child_obj(obj, "gpio", OBJECT(&s->gpio), sizeof(s->gpio),
- typename);
+ sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio), typename);
snprintf(typename, sizeof(typename), "aspeed.gpio-%s-1_8v", socname);
- sysbus_init_child_obj(obj, "gpio_1_8v", OBJECT(&s->gpio_1_8v),
+ sysbus_init_child_obj(obj, "gpio_1_8v", &s->gpio_1_8v,
sizeof(s->gpio_1_8v), typename);
- sysbus_init_child_obj(obj, "sd-controller", OBJECT(&s->sdhci),
+ sysbus_init_child_obj(obj, "sd-controller", &s->sdhci,
sizeof(s->sdhci), TYPE_ASPEED_SDHCI);
object_property_set_int(OBJECT(&s->sdhci), 2, "num-slots", &error_abort);
@@ -213,17 +208,17 @@ static void aspeed_soc_ast2600_init(Object *obj)
/* Init sd card slot class here so that they're under the correct parent */
for (i = 0; i < ASPEED_SDHCI_NUM_SLOTS; ++i) {
sysbus_init_child_obj(obj, "sd-controller.sdhci[*]",
- OBJECT(&s->sdhci.slots[i]),
+ &s->sdhci.slots[i],
sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);
}
- sysbus_init_child_obj(obj, "emmc-controller", OBJECT(&s->emmc),
+ sysbus_init_child_obj(obj, "emmc-controller", &s->emmc,
sizeof(s->emmc), TYPE_ASPEED_SDHCI);
object_property_set_int(OBJECT(&s->emmc), 1, "num-slots", &error_abort);
sysbus_init_child_obj(obj, "emmc-controller.sdhci",
- OBJECT(&s->emmc.slots[0]), sizeof(s->emmc.slots[0]),
+ &s->emmc.slots[0], sizeof(s->emmc.slots[0]),
TYPE_SYSBUS_SDHCI);
}
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index 18d1763aba..5806e5c9b4 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -146,8 +146,7 @@ static void aspeed_soc_init(Object *obj)
}
snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname);
- sysbus_init_child_obj(obj, "scu", OBJECT(&s->scu), sizeof(s->scu),
- typename);
+ sysbus_init_child_obj(obj, "scu", &s->scu, sizeof(s->scu), typename);
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",
sc->silicon_rev);
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
@@ -157,39 +156,36 @@ static void aspeed_soc_init(Object *obj)
object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),
"hw-prot-key");
- sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic),
+ sysbus_init_child_obj(obj, "vic", &s->vic, sizeof(s->vic),
TYPE_ASPEED_VIC);
- sysbus_init_child_obj(obj, "rtc", OBJECT(&s->rtc), sizeof(s->rtc),
+ sysbus_init_child_obj(obj, "rtc", &s->rtc, sizeof(s->rtc),
TYPE_ASPEED_RTC);
snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
- sysbus_init_child_obj(obj, "timerctrl", OBJECT(&s->timerctrl),
+ sysbus_init_child_obj(obj, "timerctrl", &s->timerctrl,
sizeof(s->timerctrl), typename);
snprintf(typename, sizeof(typename), "aspeed.i2c-%s", socname);
- sysbus_init_child_obj(obj, "i2c", OBJECT(&s->i2c), sizeof(s->i2c),
- typename);
+ sysbus_init_child_obj(obj, "i2c", &s->i2c, sizeof(s->i2c), typename);
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
- sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
- typename);
+ sysbus_init_child_obj(obj, "fmc", &s->fmc, sizeof(s->fmc), typename);
object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
for (i = 0; i < sc->spis_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1,
socname);
- sysbus_init_child_obj(obj, "spi[*]", OBJECT(&s->spi[i]),
+ sysbus_init_child_obj(obj, "spi[*]", &s->spi[i],
sizeof(s->spi[i]), typename);
}
for (i = 0; i < sc->ehcis_num; i++) {
- sysbus_init_child_obj(obj, "ehci[*]", OBJECT(&s->ehci[i]),
+ sysbus_init_child_obj(obj, "ehci[*]", &s->ehci[i],
sizeof(s->ehci[i]), TYPE_PLATFORM_EHCI);
}
snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname);
- sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
- typename);
+ sysbus_init_child_obj(obj, "sdmc", &s->sdmc, sizeof(s->sdmc), typename);
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
"ram-size");
object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
@@ -197,30 +193,29 @@ static void aspeed_soc_init(Object *obj)
for (i = 0; i < sc->wdts_num; i++) {
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);
- sysbus_init_child_obj(obj, "wdt[*]", OBJECT(&s->wdt[i]),
+ sysbus_init_child_obj(obj, "wdt[*]", &s->wdt[i],
sizeof(s->wdt[i]), typename);
}
for (i = 0; i < sc->macs_num; i++) {
- sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[i]),
+ sysbus_init_child_obj(obj, "ftgmac100[*]", &s->ftgmac100[i],
sizeof(s->ftgmac100[i]), TYPE_FTGMAC100);
}
- sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
+ sysbus_init_child_obj(obj, "xdma", &s->xdma, sizeof(s->xdma),
TYPE_ASPEED_XDMA);
snprintf(typename, sizeof(typename), "aspeed.gpio-%s", socname);
- sysbus_init_child_obj(obj, "gpio", OBJECT(&s->gpio), sizeof(s->gpio),
- typename);
+ sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio), typename);
- sysbus_init_child_obj(obj, "sdc", OBJECT(&s->sdhci), sizeof(s->sdhci),
+ sysbus_init_child_obj(obj, "sdc", &s->sdhci, sizeof(s->sdhci),
TYPE_ASPEED_SDHCI);
object_property_set_int(OBJECT(&s->sdhci), 2, "num-slots", &error_abort);
/* Init sd card slot class here so that they're under the correct parent */
for (i = 0; i < ASPEED_SDHCI_NUM_SLOTS; ++i) {
- sysbus_init_child_obj(obj, "sdhci[*]", OBJECT(&s->sdhci.slots[i]),
+ sysbus_init_child_obj(obj, "sdhci[*]", &s->sdhci.slots[i],
sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);
}
}
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index fe126581e4..c278827b09 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -189,7 +189,7 @@ static void nrf51_soc_init(Object *obj)
memory_region_init(&s->container, obj, "nrf51-container", UINT64_MAX);
- sysbus_init_child_obj(OBJECT(s), "armv6m", OBJECT(&s->cpu), sizeof(s->cpu),
+ sysbus_init_child_obj(OBJECT(s), "armv6m", &s->cpu, sizeof(s->cpu),
TYPE_ARMV7M);
qdev_prop_set_string(DEVICE(&s->cpu), "cpu-type",
ARM_CPU_TYPE_NAME("cortex-m0"));
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index a34ccdf616..d90f3a463b 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -454,8 +454,8 @@ static void boston_mach_init(MachineState *machine)
is_64b = cpu_supports_isa(machine->cpu_type, ISA_MIPS64);
- sysbus_init_child_obj(OBJECT(machine), "cps", OBJECT(&s->cps),
- sizeof(s->cps), TYPE_MIPS_CPS);
+ sysbus_init_child_obj(OBJECT(machine), "cps", &s->cps, sizeof(s->cps),
+ TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), machine->cpu_type, "cpu-type",
&error_fatal);
object_property_set_int(OBJECT(&s->cps), machine->smp.cpus, "num-vp",
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index d03e1c3e49..be0b4d3195 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1183,7 +1183,7 @@ static void create_cpu_without_cps(MachineState *ms,
static void create_cps(MachineState *ms, MaltaState *s,
qemu_irq *cbus_irq, qemu_irq *i8259_irq)
{
- sysbus_init_child_obj(OBJECT(s), "cps", OBJECT(&s->cps), sizeof(s->cps),
+ sysbus_init_child_obj(OBJECT(s), "cps", &s->cps, sizeof(s->cps),
TYPE_MIPS_CPS);
object_property_set_str(OBJECT(&s->cps), ms->cpu_type, "cpu-type",
&error_fatal);
--
2.26.2
- [PATCH v3 34/39] auxbus: Eliminate aux_create_slave(), (continued)
- [PATCH v3 34/39] auxbus: Eliminate aux_create_slave(), Markus Armbruster, 2020/06/09
- [PATCH v3 28/39] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 33/39] auxbus: Convert a use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/09
- [PATCH v3 29/39] usb: Eliminate usb_try_create_simple(), Markus Armbruster, 2020/06/09
- [PATCH v3 17/39] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 13/39] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/06/09
- [PATCH v3 22/39] ssi: ssi_auto_connect_slaves() never does anything, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 27/39] usb: Convert uses of usb_create(), Markus Armbruster, 2020/06/09
- [PATCH v3 11/39] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 04/39] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/09
- [PATCH v3 39/39] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls,
Markus Armbruster <=
- [PATCH v3 36/39] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/06/09
- [PATCH v3 31/39] auxbus: Rename aux_init_bus() to aux_bus_init(), Markus Armbruster, 2020/06/09
- [PATCH v3 20/39] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/06/09
- Re: [PATCH v3 00/39] qdev: Rework how we plug into the parent bus, Markus Armbruster, 2020/06/09