openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/arm/allwinner-a10: Remove local qemu_irq variables 

We won't reuse the CPU IRQ/FIQ variables. Simplify by calling
qdev_get_gpio_in() in place.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20191230110953.25496-6-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-01-17 14:09:30 +00:00 committed by Peter Maydell
parent f8a865d36d
commit af4ba4ed13
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm/allwinner-a10.c
View File

@ -55,7 +55,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
{ {
AwA10State *s = AW_A10(dev); AwA10State *s = AW_A10(dev);
SysBusDevice *sysbusdev; SysBusDevice *sysbusdev;
qemu_irq fiq, irq;
Error *err = NULL; Error *err = NULL;
object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); 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); error_propagate(errp, err);
return; 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); object_property_set_bool(OBJECT(&s->intc), true, "realized", &err);
if (err != NULL) { if (err != NULL) {
@ -73,8 +70,10 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
} }
sysbusdev = SYS_BUS_DEVICE(&s->intc); sysbusdev = SYS_BUS_DEVICE(&s->intc);
sysbus_mmio_map(sysbusdev, 0, AW_A10_PIC_REG_BASE); sysbus_mmio_map(sysbusdev, 0, AW_A10_PIC_REG_BASE);
sysbus_connect_irq(sysbusdev, 0, irq); sysbus_connect_irq(sysbusdev, 0,
sysbus_connect_irq(sysbusdev, 1, fiq); 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); qdev_pass_gpios(DEVICE(&s->intc), dev, NULL);
object_property_set_bool(OBJECT(&s->timer), true, "realized", &err); object_property_set_bool(OBJECT(&s->timer), true, "realized", &err);