Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 14:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI/ACPI: Drop unnecessary _OSC existence tests

Browse Source 
There's no need to check whether _OSC exists here; we eventually
call acpi_evaluate_object(..., "_OSC", ...), and that will fail
gracefully if _OSC doesn't exist.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Bjorn Helgaas 2013-09-05 15:07:41 -06:00
parent 7dab9ef4f0
commit 4ffe6e54b0
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/pci_root.c
View File

@ -180,11 +180,7 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags) static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags)
{ {
acpi_status status; acpi_status status;
acpi_handle tmp;
status = acpi_get_handle(root->device->handle, "_OSC", &tmp);
if (ACPI_FAILURE(status))
return status;
mutex_lock(&osc_lock); mutex_lock(&osc_lock);
status = acpi_pci_query_osc(root, flags, NULL); status = acpi_pci_query_osc(root, flags, NULL);
mutex_unlock(&osc_lock); mutex_unlock(&osc_lock);
@ -316,9 +312,8 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev);
acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req) acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
{ {
struct acpi_pci_root *root; struct acpi_pci_root *root;
acpi_status status; acpi_status status = AE_OK;
u32 ctrl, capbuf[3]; u32 ctrl, capbuf[3];
acpi_handle tmp;
if (!mask) if (!mask)
return AE_BAD_PARAMETER; return AE_BAD_PARAMETER;
@ -331,10 +326,6 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
if (!root) if (!root)
return AE_NOT_EXIST; return AE_NOT_EXIST;
status = acpi_get_handle(handle, "_OSC", &tmp);
if (ACPI_FAILURE(status))
return status;
mutex_lock(&osc_lock); mutex_lock(&osc_lock);
*mask = ctrl | root->osc_control_set; *mask = ctrl | root->osc_control_set;