diff options
-rw-r--r-- | drivers/pci/pci-acpi.c | 6 | ||||
-rw-r--r-- | include/linux/pci-acpi.h | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 02e4876b3b2c..e569645d59e2 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
@@ -156,13 +156,13 @@ run_osc_out: | |||
156 | } | 156 | } |
157 | 157 | ||
158 | /** | 158 | /** |
159 | * pci_osc_support_set - register OS support to Firmware | 159 | * __pci_osc_support_set - register OS support to Firmware |
160 | * @flags: OS support bits | 160 | * @flags: OS support bits |
161 | * | 161 | * |
162 | * Update OS support fields and doing a _OSC Query to obtain an update | 162 | * Update OS support fields and doing a _OSC Query to obtain an update |
163 | * from Firmware on supported control bits. | 163 | * from Firmware on supported control bits. |
164 | **/ | 164 | **/ |
165 | acpi_status pci_osc_support_set(u32 flags) | 165 | acpi_status __pci_osc_support_set(u32 flags, const char *hid) |
166 | { | 166 | { |
167 | u32 temp; | 167 | u32 temp; |
168 | acpi_status retval; | 168 | acpi_status retval; |
@@ -176,7 +176,7 @@ acpi_status pci_osc_support_set(u32 flags) | |||
176 | temp = ctrlset_buf[OSC_CONTROL_TYPE]; | 176 | temp = ctrlset_buf[OSC_CONTROL_TYPE]; |
177 | ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE; | 177 | ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE; |
178 | ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS; | 178 | ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS; |
179 | acpi_get_devices ( PCI_ROOT_HID_STRING, | 179 | acpi_get_devices(hid, |
180 | acpi_query_osc, | 180 | acpi_query_osc, |
181 | ctrlset_buf, | 181 | ctrlset_buf, |
182 | (void **) &retval ); | 182 | (void **) &retval ); |
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 936ef82ed76a..3ba25065fa96 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h | |||
@@ -48,7 +48,15 @@ | |||
48 | 48 | ||
49 | #ifdef CONFIG_ACPI | 49 | #ifdef CONFIG_ACPI |
50 | extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); | 50 | extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); |
51 | extern acpi_status pci_osc_support_set(u32 flags); | 51 | extern acpi_status __pci_osc_support_set(u32 flags, const char *hid); |
52 | static inline acpi_status pci_osc_support_set(u32 flags) | ||
53 | { | ||
54 | return __pci_osc_support_set(flags, PCI_ROOT_HID_STRING); | ||
55 | } | ||
56 | static inline acpi_status pcie_osc_support_set(u32 flags) | ||
57 | { | ||
58 | return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING); | ||
59 | } | ||
52 | #else | 60 | #else |
53 | #if !defined(AE_ERROR) | 61 | #if !defined(AE_ERROR) |
54 | typedef u32 acpi_status; | 62 | typedef u32 acpi_status; |
@@ -57,6 +65,7 @@ typedef u32 acpi_status; | |||
57 | static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) | 65 | static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) |
58 | {return AE_ERROR;} | 66 | {return AE_ERROR;} |
59 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} | 67 | static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} |
68 | static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;} | ||
60 | #endif | 69 | #endif |
61 | 70 | ||
62 | #endif /* _PCI_ACPI_H_ */ | 71 | #endif /* _PCI_ACPI_H_ */ |