[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable |
Date: |
Wed, 15 Feb 2023 12:26:57 +0100 |
The intermediate ISAIDEState::irq variable just add noise, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/ide/isa.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 5c3e83a0fc..ad47e0899e 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -45,7 +45,6 @@ struct ISAIDEState {
uint32_t iobase;
uint32_t iobase2;
uint32_t irqnum;
- qemu_irq irq;
};
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_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);
}
--
2.38.1
- Re: [PATCH 01/20] MAINTAINERS: Mark IDE and Floppy as "Odd Fixes", (continued)
- [PATCH 02/20] hw/ide/mmio: Use CamelCase for MMIO_IDE state name, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 03/20] hw/ide/mmio: Extract TYPE_MMIO_IDE declarations to 'hw/ide/mmio.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 04/20] hw/ide/isa: Extract TYPE_ISA_IDE declarations to 'hw/ide/isa.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable,
Philippe Mathieu-Daudé <=
- [PATCH 06/20] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 07/20] hw/ide: Remove unused 'qapi/qapi-types-run-state.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 08/20] hw/ide: Include 'exec/ioport.h' instead of 'hw/isa/isa.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 09/20] hw/ide: Un-inline ide_set_irq(), Philippe Mathieu-Daudé, 2023/02/15