From a576158ee9e68d3237bb5a2b0ff0280b291e7972 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Wed, 8 Jun 2022 09:53:13 -0400 Subject: [PATCH] isa-bus: drop no longer used ISADeviceClass::build_aml Signed-off-by: Igor Mammedov Acked-by: Gerd Hoffmann Message-Id: <20220608135340.3304695-9-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/isa/isa-bus.c | 12 +----------- include/hw/isa/isa.h | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) 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); } } 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 {