[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] hw/char/pl011: Open-code pl011_luminary_create()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/8] hw/char/pl011: Open-code pl011_luminary_create() |
Date: |
Mon, 20 Feb 2023 12:51:09 +0100 |
pl011_luminary_create() is only used for the Stellaris board,
open-code it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/stellaris.c | 11 ++++++++---
include/hw/char/pl011.h | 17 -----------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 67a2293d35..f7e99baf62 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)) {
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index d82870c006..d853802132 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
--
2.38.1
- [PATCH 0/8] hw/arm: Cleanups around QOM style, Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 1/8] hw/gpio/max7310: Simplify max7310_realize(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 2/8] hw/char/pl011: Un-inline pl011_create(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 3/8] hw/char/pl011: Open-code pl011_luminary_create(),
Philippe Mathieu-Daudé <=
- [PATCH 4/8] hw/char/xilinx_uartlite: Expose XILINX_UARTLITE QOM type, Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 5/8] hw/char/xilinx_uartlite: Open-code xilinx_uartlite_create(), Philippe Mathieu-Daudé, 2023/02/20
- [PATCH 6/8] hw/char/cmsdk-apb-uart: Open-code cmsdk_apb_uart_create(), Philippe Mathieu-Daudé, 2023/02/20