[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/54] isa-bus: drop no longer used ISADeviceClass::build_aml
From: |
Michael S. Tsirkin |
Subject: |
[PULL 08/54] isa-bus: drop no longer used ISADeviceClass::build_aml |
Date: |
Fri, 10 Jun 2022 03:57:24 -0400 |
From: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220608135340.3304695-9-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/isa/isa.h | 1 -
hw/isa/isa-bus.c | 12 +-----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 034d706ba1..5c5a3d43a7 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -64,7 +64,6 @@ struct IsaDmaClass {
struct ISADeviceClass {
DeviceClass parent_class;
- void (*build_aml)(ISADevice *dev, Aml *scope);
};
struct ISABus {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 237e2cee12..1bee1a47f1 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -191,19 +191,9 @@ ISADevice *isa_vga_init(ISABus *bus)
void isa_build_aml(ISABus *bus, Aml *scope)
{
BusChild *kid;
- ISADevice *dev;
- ISADeviceClass *dc;
QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) {
- dev = ISA_DEVICE(kid->child);
- dc = ISA_DEVICE_GET_CLASS(dev);
- bool has_build_dev_aml = !!object_dynamic_cast(OBJECT(dev),
- TYPE_ACPI_DEV_AML_IF);
- if (dc->build_aml) {
- dc->build_aml(dev, scope);
- } else if (has_build_dev_aml) {
- call_dev_aml_func(DEVICE(dev), scope);
- }
+ call_dev_aml_func(DEVICE(kid->child), scope);
}
}
--
MST
- [PULL 00/54] virtio,pc,pci: fixes,cleanups,features, Michael S. Tsirkin, 2022/06/10
- [PULL 01/54] acpi: add interface to build device specific AML, Michael S. Tsirkin, 2022/06/10
- [PULL 02/54] acpi: make isa_build_aml() support AcpiDevAmlIf interface, Michael S. Tsirkin, 2022/06/10
- [PULL 03/54] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 04/54] acpi: parallel port: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 05/54] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 07/54] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 08/54] isa-bus: drop no longer used ISADeviceClass::build_aml,
Michael S. Tsirkin <=
- [PULL 06/54] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 11/54] tests: acpi: update expected blob DSDT.ipmismbus, Michael S. Tsirkin, 2022/06/10
- [PULL 09/54] tests: acpi: add and whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 10/54] tests: acpi: q35: add test for smbus-ipmi device, Michael S. Tsirkin, 2022/06/10
- [PULL 12/54] tests: acpi: whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 13/54] ipmi: acpi: use relative path to resource source, Michael S. Tsirkin, 2022/06/10
- [PULL 14/54] tests: acpi: update expected DSDT.ipmismbus blob, Michael S. Tsirkin, 2022/06/10
- [PULL 15/54] acpi: ich9-smb: add support for AcpiDevAmlIf interface, Michael S. Tsirkin, 2022/06/10
- [PULL 16/54] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors, Michael S. Tsirkin, 2022/06/10
- [PULL 17/54] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi, Michael S. Tsirkin, 2022/06/10