On 22/2/22 20:34, Bernhard Beschow wrote:
isa_init_irq() had become a trivial one-line wrapper for isa_get_irq(). The previous commits resolved all usages in favor of isa_get_irq(). isa_init_irq() can therefore be removed.Signed-off-by: Bernhard Beschow <shen...@gmail.com> --- hw/isa/isa-bus.c | 5 ----- include/hw/isa/isa.h | 1 - 2 files changed, 6 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 1e8c102177..0ad1c5fd65 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -85,11 +85,6 @@ 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_get_irq(isadev, isairq); diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d80cab5b79..034d706ba1 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -90,7 +90,6 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space, MemoryRegion *address_space_io, Error **errp); void isa_bus_irqs(ISABus *bus, qemu_irq *irqs); qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq); -void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq); void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq); void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16); IsaDma *isa_get_dma(ISABus *bus, int nchan);
I'd merge patches 7-22 as "Inline and remove one-line isa_init_irq()". Either merged or for each 7-22 patch: Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
