[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/15] acpi: drop pointless _STA method
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 04/15] acpi: drop pointless _STA method |
Date: |
Wed, 29 Apr 2020 15:59:52 +0200 |
When returning a constant there is no point in having a method
in the first place, _STA can be a simple integer instead.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-build.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 23c77eeb95a9..3a046b03e4cd 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1151,14 +1151,11 @@ static Aml *build_kbd_device_aml(void)
{
Aml *dev;
Aml *crs;
- Aml *method;
dev = aml_device("KBD");
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0303")));
- method = aml_method("_STA", 0, AML_NOTSERIALIZED);
- aml_append(method, aml_return(aml_int(0x0f)));
- aml_append(dev, method);
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
crs = aml_resource_template();
aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01));
@@ -1173,14 +1170,11 @@ static Aml *build_mouse_device_aml(void)
{
Aml *dev;
Aml *crs;
- Aml *method;
dev = aml_device("MOU");
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0F13")));
- method = aml_method("_STA", 0, AML_NOTSERIALIZED);
- aml_append(method, aml_return(aml_int(0x0f)));
- aml_append(dev, method);
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
crs = aml_resource_template();
aml_append(crs, aml_irq_no_flags(12));
@@ -2238,9 +2232,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
TPM_CRB_ADDR_SIZE, AML_READ_WRITE));
aml_append(dev, aml_name_decl("_CRS", crs));
- method = aml_method("_STA", 0, AML_NOTSERIALIZED);
- aml_append(method, aml_return(aml_int(0x0f)));
- aml_append(dev, method);
+ aml_append(dev, aml_name_decl("_STA", aml_int(0xf)));
tpm_build_ppi_acpi(tpm, dev);
--
2.18.2
- [PATCH v3 00/15] acpi: i386 tweaks, Gerd Hoffmann, 2020/04/29
- [PATCH v3 03/15] qtest: allow DSDT acpi table changes, Gerd Hoffmann, 2020/04/29
- [PATCH v3 04/15] acpi: drop pointless _STA method,
Gerd Hoffmann <=
- [PATCH v3 01/15] move 'typedef Aml' to qemu/types.h, Gerd Hoffmann, 2020/04/29
- [PATCH v3 12/15] acpi: move aml builder code for floppy device, Gerd Hoffmann, 2020/04/29
- [PATCH v3 05/15] acpi: add ISADeviceClass->build_aml(), Gerd Hoffmann, 2020/04/29
- [PATCH v3 09/15] acpi: move aml builder code for serial device, Gerd Hoffmann, 2020/04/29
- [PATCH v3 14/15] acpi: factor out fw_cfg_add_acpi_dsdt(), Gerd Hoffmann, 2020/04/29
- [PATCH v3 11/15] acpi: move aml builder code for parallel device, Gerd Hoffmann, 2020/04/29