[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/25] hw/char/pl011: Open-code pl011_luminary_create()
From: |
Peter Maydell |
Subject: |
[PULL 15/25] hw/char/pl011: Open-code pl011_luminary_create() |
Date: |
Mon, 27 Feb 2023 14:00:52 +0000 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
pl011_luminary_create() is only used for the Stellaris board,
open-code it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230220115114.25237-4-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/char/pl011.h | 17 -----------------
hw/arm/stellaris.c | 11 ++++++++---
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index d82870c0069..d8538021323 100644
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -57,21 +57,4 @@ struct PL011State {
DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr);
-static inline DeviceState *pl011_luminary_create(hwaddr addr,
- qemu_irq irq,
- Chardev *chr)
-{
- DeviceState *dev;
- SysBusDevice *s;
-
- dev = qdev_new("pl011_luminary");
- s = SYS_BUS_DEVICE(dev);
- qdev_prop_set_chr(dev, "chardev", chr);
- sysbus_realize_and_unref(s, &error_fatal);
- sysbus_mmio_map(s, 0, addr);
- sysbus_connect_irq(s, 0, irq);
-
- return dev;
-}
-
#endif
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 67a2293d35f..f7e99baf623 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1146,9 +1146,14 @@ static void stellaris_init(MachineState *ms,
stellaris_board_info *board)
for (i = 0; i < 4; i++) {
if (board->dc2 & (1 << i)) {
- pl011_luminary_create(0x4000c000 + i * 0x1000,
- qdev_get_gpio_in(nvic, uart_irq[i]),
- serial_hd(i));
+ SysBusDevice *sbd;
+
+ dev = qdev_new("pl011_luminary");
+ sbd = SYS_BUS_DEVICE(dev);
+ qdev_prop_set_chr(dev, "chardev", serial_hd(i));
+ sysbus_realize_and_unref(sbd, &error_fatal);
+ sysbus_mmio_map(sbd, 0, 0x4000c000 + i * 0x1000);
+ sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(nvic, uart_irq[i]));
}
}
if (board->dc2 & (1 << 4)) {
--
2.34.1
- [PULL 00/25] target-arm queue, Peter Maydell, 2023/02/27
- [PULL 01/25] include/hw/arm/allwinner-a10.h: Remove superfluous includes from the header, Peter Maydell, 2023/02/27
- [PULL 02/25] target/arm: Wrap breakpoint/watchpoint updates with tcg_enabled, Peter Maydell, 2023/02/27
- [PULL 05/25] target/arm: move helpers to tcg/, Peter Maydell, 2023/02/27
- [PULL 08/25] target/arm: Move hflags code into the tcg directory, Peter Maydell, 2023/02/27
- [PULL 14/25] hw/char/pl011: Un-inline pl011_create(), Peter Maydell, 2023/02/27
- [PULL 17/25] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create(), Peter Maydell, 2023/02/27
- [PULL 21/25] hw/arm/musicpal: Remove unused dummy MemoryRegion, Peter Maydell, 2023/02/27
- [PULL 25/25] hw: Replace qemu_or_irq typedef by OrIRQState, Peter Maydell, 2023/02/27
- [PULL 09/25] target/arm: Move regime_using_lpae_format into internal.h, Peter Maydell, 2023/02/27
- [PULL 15/25] hw/char/pl011: Open-code pl011_luminary_create(),
Peter Maydell <=
- [PULL 07/25] target/arm: Wrap arm_rebuild_hflags calls with tcg_enabled, Peter Maydell, 2023/02/27
- [PULL 10/25] target/arm: Don't access TCG code when debugging with KVM, Peter Maydell, 2023/02/27
- [PULL 12/25] tests/avocado: add machine:none tag to version.py, Peter Maydell, 2023/02/27
- [PULL 03/25] target/arm: Wrap TCG-only code in debug_helper.c, Peter Maydell, 2023/02/27
- [PULL 16/25] hw/char/xilinx_uartlite: Expose XILINX_UARTLITE QOM type, Peter Maydell, 2023/02/27
- [PULL 20/25] hw/intc/armv7m_nvic: Use QOM cast CPU() macro, Peter Maydell, 2023/02/27
- [PULL 22/25] iothread: Remove unused IOThreadClass / IOTHREAD_CLASS, Peter Maydell, 2023/02/27
- [PULL 23/25] hw/irq: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE(), Peter Maydell, 2023/02/27
- [PULL 06/25] target/arm: Move psci.c into the tcg directory, Peter Maydell, 2023/02/27
- [PULL 04/25] target/arm: move translate modules to tcg/, Peter Maydell, 2023/02/27