[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables
From: |
Peter Maydell |
Subject: |
[PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables |
Date: |
Fri, 17 Jan 2020 14:28:10 +0000 |
From: Philippe Mathieu-Daudé <address@hidden>
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>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Maydell <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 966fbd4a6e5..1cde1656116 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.20.1
- [PULL 00/15] target-arm queue, Peter Maydell, 2020/01/17
- [PULL 01/15] hw/misc: Add the STM32F4xx Sysconfig device, Peter Maydell, 2020/01/17
- [PULL 02/15] hw/misc: Add the STM32F4xx EXTI device, Peter Maydell, 2020/01/17
- [PULL 03/15] hw/arm: Add the STM32F4xx SoC, Peter Maydell, 2020/01/17
- [PULL 04/15] hw/arm: Add the Netduino Plus 2, Peter Maydell, 2020/01/17
- [PULL 05/15] tests/boot_linux_console: Add initrd test for the CubieBoard, Peter Maydell, 2020/01/17
- [PULL 08/15] hw/arm/allwinner-a10: Simplify by passing IRQs with qdev_pass_gpios(), Peter Maydell, 2020/01/17
- [PULL 07/15] hw/arm/allwinner-a10: Move SoC definitions out of header, Peter Maydell, 2020/01/17
- [PULL 06/15] tests/boot_linux_console: Add a SD card test for the CubieBoard, Peter Maydell, 2020/01/17
- [PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables,
Peter Maydell <=
- [PULL 10/15] target/arm/arm-semi: fix SYS_OPEN to return nonzero filehandle, Peter Maydell, 2020/01/17
- [PULL 12/15] target/arm: adjust program counter for wfi exception in AArch32, Peter Maydell, 2020/01/17
- [PULL 11/15] i.MX: add an emulation for RNGC, Peter Maydell, 2020/01/17
- [PULL 14/15] target/arm: Return correct IL bit in merge_syn_data_abort, Peter Maydell, 2020/01/17
- [PULL 15/15] target/arm: Set ISSIs16Bit in make_issinfo, Peter Maydell, 2020/01/17
- [PULL 13/15] arm/gicv3: update virtual irq state after IAR register read, Peter Maydell, 2020/01/17
- Re: [PULL 00/15] target-arm queue, Peter Maydell, 2020/01/17