[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] hw/ide/ahci: Remove SysbusAHCIState::num_ports field
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 8/9] hw/ide/ahci: Remove SysbusAHCIState::num_ports field |
Date: |
Tue, 13 Feb 2024 09:11:59 +0100 |
No need to duplicate AHCIState::ports, directly access it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/ide/ahci.h | 1 -
hw/ide/ahci.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index 604d3a0994..c0b10c2bb4 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -63,7 +63,6 @@ struct SysbusAHCIState {
/*< public >*/
AHCIState ahci;
- uint32_t num_ports;
};
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 33f7e83687..041cc87c11 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1862,12 +1862,11 @@ static void sysbus_ahci_realize(DeviceState *dev, Error
**errp)
{
SysbusAHCIState *s = SYSBUS_AHCI(dev);
- s->ahci.ports = s->num_ports;
ahci_realize(&s->ahci, dev, &address_space_memory);
}
static Property sysbus_ahci_properties[] = {
- DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, num_ports, 1),
+ DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, ahci.ports, 1),
DEFINE_PROP_END_OF_LIST(),
};
--
2.41.0
- Re: [PATCH 3/9] hw/ide/ahci: Rename AHCI PCI function as 'pdev', (continued)
- [PATCH 4/9] hw/ide/ahci: Inline ahci_get_num_ports(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 5/9] hw/ide/ahci: Pass AHCI context to ahci_ide_create_devs(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 6/9] hw/ide/ahci: Convert AHCIState::ports to unsigned, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 7/9] hw/ide/ahci: Do not pass 'ports' argument to ahci_realize(), Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 8/9] hw/ide/ahci: Remove SysbusAHCIState::num_ports field,
Philippe Mathieu-Daudé <=
- [PATCH 9/9] hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h', Philippe Mathieu-Daudé, 2024/02/13
- Re: [PATCH 0/9] hw/ide/ahci: Housekeeping, Michael S. Tsirkin, 2024/02/13
- Re: [PATCH 0/9] hw/ide/ahci: Housekeeping, Philippe Mathieu-Daudé, 2024/02/15