=====
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: ACPI / PCI: Do not preserve _OSC control bits returned by a query (v3)
All of the remaining callers of acpi_pci_osc_control_set() either
use acpi_pci_root_osc_query() right before it, like
pcie_port_acpi_setup(), or ask for control of one feature only,
like acpi_get_hp_hw_control_from_firmware(). Thus there is no
reason to preserve the _OSC control bits returned by an _OSC query
and the osc_control_qry and osc_queried fields of struct
acpi_pci_root are not necessary any more. Remove them and modify the
code that uses them accordingly.
[v3: HS: keep query in acpi_pci_osc_control_set]
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
---
drivers/acpi/pci_root.c | 13 +++++--------
include/acpi/acpi_bus.h | 3 ---
2 files changed, 5 insertions(+), 11 deletions(-)
@@ -248,10 +248,8 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
if (ACPI_SUCCESS(status)) {
root->osc_support_set = support;
- root->osc_control_qry = result;
if (control)
*control = result;
- root->osc_queried = 1;
}
return status;
}
@@ -438,12 +436,11 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags)
goto out;
/* Need to query controls first before requesting them */
- if (!root->osc_queried) {
- status = acpi_pci_query_osc(root, root->osc_support_set, NULL);
- if (ACPI_FAILURE(status))
- goto out;
- }
- if ((root->osc_control_qry & control_req) != control_req) {
+ result = control_req;
+ status = acpi_pci_query_osc(root, root->osc_support_set, &result);
+ if (ACPI_FAILURE(status))
+ goto out;
+ if ((result & control_req) != control_req) {
printk(KERN_DEBUG
"Firmware did not grant requested _OSC control\n");
status = AE_SUPPORT;
@@ -377,9 +377,6 @@ struct acpi_pci_root {
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
- u32 osc_control_qry; /* the latest _OSC query result */
-
- u32 osc_queried:1; /* has _OSC control been queried? */
};
/* helper */