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>
This commit is contained in:
parent
794093e80a
commit
3b759fbf39
@ -45,7 +45,6 @@ struct ISAIDEState {
|
|||||||
uint32_t iobase;
|
uint32_t iobase;
|
||||||
uint32_t iobase2;
|
uint32_t iobase2;
|
||||||
uint32_t irqnum;
|
uint32_t irqnum;
|
||||||
qemu_irq irq;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void isa_ide_reset(DeviceState *d)
|
static void isa_ide_reset(DeviceState *d)
|
||||||
@ -73,8 +72,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
|
|||||||
|
|
||||||
ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
|
ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2);
|
||||||
ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
|
ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
|
||||||
s->irq = isa_get_irq(isadev, s->irqnum);
|
ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum));
|
||||||
ide_init2(&s->bus, s->irq);
|
|
||||||
vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
|
vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
|
||||||
ide_register_restart_cb(&s->bus);
|
ide_register_restart_cb(&s->bus);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user