diff options
Diffstat (limited to 'drivers/pci/pci-acpi.c')
-rw-r--r-- | drivers/pci/pci-acpi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index e9e37abe1f76..6917c6cb0912 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
@@ -91,9 +91,7 @@ acpi_query_osc ( | |||
91 | static acpi_status | 91 | static acpi_status |
92 | acpi_run_osc ( | 92 | acpi_run_osc ( |
93 | acpi_handle handle, | 93 | acpi_handle handle, |
94 | u32 level, | 94 | void *context) |
95 | void *context, | ||
96 | void **retval ) | ||
97 | { | 95 | { |
98 | acpi_status status; | 96 | acpi_status status; |
99 | struct acpi_object_list input; | 97 | struct acpi_object_list input; |
@@ -180,11 +178,12 @@ EXPORT_SYMBOL(pci_osc_support_set); | |||
180 | 178 | ||
181 | /** | 179 | /** |
182 | * pci_osc_control_set - commit requested control to Firmware | 180 | * pci_osc_control_set - commit requested control to Firmware |
181 | * @handle: acpi_handle for the target ACPI object | ||
183 | * @flags: driver's requested control bits | 182 | * @flags: driver's requested control bits |
184 | * | 183 | * |
185 | * Attempt to take control from Firmware on requested control bits. | 184 | * Attempt to take control from Firmware on requested control bits. |
186 | **/ | 185 | **/ |
187 | acpi_status pci_osc_control_set(u32 flags) | 186 | acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) |
188 | { | 187 | { |
189 | acpi_status status; | 188 | acpi_status status; |
190 | u32 ctrlset; | 189 | u32 ctrlset; |
@@ -198,10 +197,7 @@ acpi_status pci_osc_control_set(u32 flags) | |||
198 | return AE_SUPPORT; | 197 | return AE_SUPPORT; |
199 | } | 198 | } |
200 | ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset; | 199 | ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset; |
201 | status = acpi_get_devices ( PCI_ROOT_HID_STRING, | 200 | status = acpi_run_osc(handle, ctrlset_buf); |
202 | acpi_run_osc, | ||
203 | ctrlset_buf, | ||
204 | NULL ); | ||
205 | if (ACPI_FAILURE (status)) { | 201 | if (ACPI_FAILURE (status)) { |
206 | ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset; | 202 | ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset; |
207 | } | 203 | } |