[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] hw/i386/pc: Inline port92_init()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/4] hw/i386/pc: Inline port92_init() |
Date: |
Fri, 13 Dec 2019 11:50:59 +0100 |
This one-line function is not very helpful, so remove it
by inlining the call to qdev_connect_gpio_out_named().
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2c2ae27447..2e8992c7d0 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -770,11 +770,6 @@ static uint64_t port92_read(void *opaque, hwaddr addr,
return ret;
}
-static void port92_init(ISADevice *dev, qemu_irq a20_out)
-{
- qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out);
-}
-
static const VMStateDescription vmstate_port92_isa = {
.name = "port92",
.version_id = 1,
@@ -830,8 +825,8 @@ static void port92_class_initfn(ObjectClass *klass, void
*data)
dc->vmsd = &vmstate_port92_isa;
/*
* Reason: unlike ordinary ISA devices, this one needs additional
- * wiring: its A20 output line needs to be wired up by
- * port92_init().
+ * wiring: its A20 output line needs to be wired up with
+ * qdev_connect_gpio_out_named().
*/
dc->user_creatable = false;
}
@@ -1357,7 +1352,8 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl, bool no_vmport)
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042_setup_a20_line(i8042, a20_line[0]);
- port92_init(port92, a20_line[1]);
+ qdev_connect_gpio_out_named(DEVICE(port92),
+ PORT92_A20_LINE, 0, a20_line[1]);
g_free(a20_line);
}
--
2.21.0