diff options
| author | Bernhard Beschow <shentey@gmail.com> | 2022-03-01 23:00:37 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2022-03-08 19:38:17 +0100 |
| commit | 215caca6bf31913573ac0d5b729efb6ff82e1009 (patch) | |
| tree | afdc236a85763f286ff2038192f89e456e0d3dc9 /hw/isa | |
| parent | b2db46e4ca69d155790851cfb2b3a52b42ea6670 (diff) | |
| download | qemu-215caca6bf31913573ac0d5b729efb6ff82e1009.zip qemu-215caca6bf31913573ac0d5b729efb6ff82e1009.tar.gz qemu-215caca6bf31913573ac0d5b729efb6ff82e1009.tar.bz2 | |
hw/isa: Inline and remove one-line isa_init_irq()
isa_init_irq() has become a trivial one-line wrapper for isa_get_irq().
It can therefore be removed.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> (tpm_tis_isa)
Acked-by: Corey Minyard <cminyard@mvista.com> (isa_ipmi_bt, isa_ipmi_kcs)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220301220037.76555-8-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220307134353.1950-14-philippe.mathieu.daude@gmail.com>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Diffstat (limited to 'hw/isa')
| -rw-r--r-- | hw/isa/isa-bus.c | 8 | ||||
| -rw-r--r-- | hw/isa/piix4.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index c64a141..0ad1c5f 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -85,15 +85,9 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) return isabus->irqs[isairq]; } -void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) -{ - *p = isa_get_irq(dev, isairq); -} - void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) { - qemu_irq irq; - isa_init_irq(isadev, &irq, isairq); + qemu_irq irq = isa_get_irq(isadev, isairq); qdev_connect_gpio_out(DEVICE(isadev), gpioirq, irq); } diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index fc3c8b3..8607e0a 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -216,7 +216,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) { return; } - isa_init_irq(ISA_DEVICE(&s->rtc), &s->rtc.irq, s->rtc.isairq); + s->rtc.irq = isa_get_irq(ISA_DEVICE(&s->rtc), s->rtc.isairq); } static void piix4_init(Object *obj) |