projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: pcspkr - separate device and driver registration
[powerpc.git]
/
drivers
/
pci
/
pci-acpi.c
diff --git
a/drivers/pci/pci-acpi.c
b/drivers/pci/pci-acpi.c
index
e9e37ab
..
6917c6c
100644
(file)
--- a/
drivers/pci/pci-acpi.c
+++ b/
drivers/pci/pci-acpi.c
@@
-91,9
+91,7
@@
acpi_query_osc (
static acpi_status
acpi_run_osc (
acpi_handle handle,
static acpi_status
acpi_run_osc (
acpi_handle handle,
- u32 level,
- void *context,
- void **retval )
+ void *context)
{
acpi_status status;
struct acpi_object_list input;
{
acpi_status status;
struct acpi_object_list input;
@@
-180,11
+178,12
@@
EXPORT_SYMBOL(pci_osc_support_set);
/**
* pci_osc_control_set - commit requested control to Firmware
/**
* pci_osc_control_set - commit requested control to Firmware
+ * @handle: acpi_handle for the target ACPI object
* @flags: driver's requested control bits
*
* Attempt to take control from Firmware on requested control bits.
**/
* @flags: driver's requested control bits
*
* Attempt to take control from Firmware on requested control bits.
**/
-acpi_status pci_osc_control_set(u32 flags)
+acpi_status pci_osc_control_set(
acpi_handle handle,
u32 flags)
{
acpi_status status;
u32 ctrlset;
{
acpi_status status;
u32 ctrlset;
@@
-198,10
+197,7
@@
acpi_status pci_osc_control_set(u32 flags)
return AE_SUPPORT;
}
ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
return AE_SUPPORT;
}
ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
- status = acpi_get_devices ( PCI_ROOT_HID_STRING,
- acpi_run_osc,
- ctrlset_buf,
- NULL );
+ status = acpi_run_osc(handle, ctrlset_buf);
if (ACPI_FAILURE (status)) {
ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
}
if (ACPI_FAILURE (status)) {
ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
}