[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/6] hw/arm/allwinner-a10: Remove local qemu_irq variables
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 5/6] hw/arm/allwinner-a10: Remove local qemu_irq variables |
Date: |
Mon, 30 Dec 2019 12:09:52 +0100 |
We won't reuse the CPU IRQ/FIQ variables. Simplify by calling
qdev_get_gpio_in() in place.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/allwinner-a10.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 966fbd4a6e..1cde165611 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -55,7 +55,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
{
AwA10State *s = AW_A10(dev);
SysBusDevice *sysbusdev;
- qemu_irq fiq, irq;
Error *err = NULL;
object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
@@ -63,8 +62,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
error_propagate(errp, err);
return;
}
- irq = qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ);
- fiq = qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ);
object_property_set_bool(OBJECT(&s->intc), true, "realized", &err);
if (err != NULL) {
@@ -73,8 +70,10 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
}
sysbusdev = SYS_BUS_DEVICE(&s->intc);
sysbus_mmio_map(sysbusdev, 0, AW_A10_PIC_REG_BASE);
- sysbus_connect_irq(sysbusdev, 0, irq);
- sysbus_connect_irq(sysbusdev, 1, fiq);
+ sysbus_connect_irq(sysbusdev, 0,
+ qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
+ sysbus_connect_irq(sysbusdev, 1,
+ qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
qdev_pass_gpios(DEVICE(&s->intc), dev, NULL);
object_property_set_bool(OBJECT(&s->timer), true, "realized", &err);
--
2.21.0
- [PATCH 0/6] hw/arm/cubieboard: Few cleanups, add acceptance tests, Philippe Mathieu-Daudé, 2019/12/30
- [PATCH 1/6] tests/boot_linux_console: Add initrd test for the CubieBoard, Philippe Mathieu-Daudé, 2019/12/30
- [PATCH 3/6] hw/arm/allwinner-a10: Move SoC definitions out of header, Philippe Mathieu-Daudé, 2019/12/30
- [PATCH 2/6] tests/boot_linux_console: Add a SD card test for the CubieBoard, Philippe Mathieu-Daudé, 2019/12/30
- [PATCH 4/6] hw/arm/allwinner-a10: Simplify by passing IRQs with qdev_pass_gpios(), Philippe Mathieu-Daudé, 2019/12/30
- [PATCH 5/6] hw/arm/allwinner-a10: Remove local qemu_irq variables,
Philippe Mathieu-Daudé <=
- [RFC PATCH 6/6] hw/arm/cubieboard: Disable unsupported M-USB in device tree blob, Philippe Mathieu-Daudé, 2019/12/30