commit 3b759fbf390dbfd86fe397a4f7dc5d4920d37091
author Philippe Mathieu-Daudé <philmd@linaro.org> Fri Feb 10 23:16:51 2023 +0100
committer Philippe Mathieu-Daudé <philmd@linaro.org> Mon Feb 27 22:29:02 2023 +0100
tree ef8231769199e3db9c83e1fe22044fa1a1f78a1c
parent 794093e80a2fb0e13f921b52ebe1a02ad30ab735

hw/ide/isa: Remove intermediate ISAIDEState::irq variable

The intermediate ISAIDEState::irq variable just add noise, remove it.

Message-Id: <20230215112712.23110-6-philmd@linaro.org>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

hw/ide/isa.c

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 5c3e83a..ad47e08 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -45,7 +45,6 @@
     uint32_t  iobase;
     uint32_t  iobase2;
     uint32_t  irqnum;
-    qemu_irq  irq;
 };
 
 static void isa_ide_reset(DeviceState *d)
@@ -73,8 +72,7 @@
 
     ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
     ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
-    s->irq = isa_get_irq(isadev, s->irqnum);
-    ide_init2(&s->bus, s->irq);
+    ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum));
     vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
     ide_register_restart_cb(&s->bus);
 }