===================================================================
@@ -247,10 +247,8 @@ static acpi_status acpi_pci_query_osc(st
status = acpi_pci_run_osc(root->device->handle, capbuf);
if (ACPI_SUCCESS(status)) {
root->osc_support_set = support;
- root->osc_control_qry = capbuf[OSC_CONTROL_TYPE];
if (control)
*control = capbuf[OSC_CONTROL_TYPE];
- root->osc_queried = 1;
}
return status;
}
@@ -433,19 +431,6 @@ acpi_status acpi_pci_osc_control_set(acp
if ((root->osc_control_set & control_req) == control_req)
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) {
- printk(KERN_DEBUG
- "Firmware did not grant requested _OSC control\n");
- status = AE_SUPPORT;
- goto out;
- }
-
capbuf[OSC_QUERY_TYPE] = 0;
capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set;
capbuf[OSC_CONTROL_TYPE] = root->osc_control_set | control_req;
===================================================================
@@ -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 */