From: Rafael J. Wysocki <rjw@xxxxxxx> All of the existing callers of acpi_pci_osc_control_set() also call acpi_pci_osc_control_query() right prior to it, so they don't use the preserved control bits returned by the last _OSC query for the given PCI root bridge (or PCIe root complex). For this reason the osc_control_qry and osc_queried members of struct acpi_pci_root are not necessary any more, so drop them and remove the remaining code using them. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- drivers/acpi/pci_root.c | 19 +------------------ include/acpi/acpi_bus.h | 3 --- 2 files changed, 1 insertion(+), 21 deletions(-) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -248,12 +248,8 @@ static acpi_status acpi_pci_query_osc(st status = acpi_pci_run_osc(root->device->handle, capbuf, &result); if (ACPI_SUCCESS(status)) { root->osc_support_set = support; - if (control) { + if (control) *control = result; - } else { - root->osc_control_qry = result; - root->osc_queried = 1; - } } return status; } @@ -449,19 +445,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; Index: linux-2.6/include/acpi/acpi_bus.h =================================================================== --- linux-2.6.orig/include/acpi/acpi_bus.h +++ linux-2.6/include/acpi/acpi_bus.h @@ -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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html