aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/pci-acpi.c25
-rw-r--r--include/linux/pci-acpi.h11
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 8a1f02c3c915..8f923ee5177f 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -175,31 +175,6 @@ out:
175 return rc; 175 return rc;
176} 176}
177 177
178static acpi_status acpi_query_osc(acpi_handle handle, u32 level,
179 void *context, void **retval)
180{
181 pci_acpi_osc_support(handle, (unsigned long)context);
182 return AE_OK;
183}
184
185/**
186 * __pci_osc_support_set - register OS support to Firmware
187 * @flags: OS support bits
188 * @hid: hardware ID
189 *
190 * Update OS support fields and doing a _OSC Query to obtain an update
191 * from Firmware on supported control bits.
192 **/
193acpi_status __pci_osc_support_set(u32 flags, const char *hid)
194{
195 if (!(flags & OSC_SUPPORT_MASKS))
196 return AE_TYPE;
197
198 acpi_get_devices(hid, acpi_query_osc,
199 (void *)(unsigned long)flags, NULL);
200 return AE_OK;
201}
202
203/** 178/**
204 * pci_osc_control_set - commit requested control to Firmware 179 * pci_osc_control_set - commit requested control to Firmware
205 * @handle: acpi_handle for the target ACPI object 180 * @handle: acpi_handle for the target ACPI object
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 424f06f84cab..871e096e0fbc 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -50,16 +50,7 @@
50 50
51#ifdef CONFIG_ACPI 51#ifdef CONFIG_ACPI
52extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); 52extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
53extern acpi_status __pci_osc_support_set(u32 flags, const char *hid);
54int pci_acpi_osc_support(acpi_handle handle, u32 flags); 53int pci_acpi_osc_support(acpi_handle handle, u32 flags);
55static inline acpi_status pci_osc_support_set(u32 flags)
56{
57 return __pci_osc_support_set(flags, PCI_ROOT_HID_STRING);
58}
59static inline acpi_status pcie_osc_support_set(u32 flags)
60{
61 return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);
62}
63static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) 54static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
64{ 55{
65 /* Find root host bridge */ 56 /* Find root host bridge */
@@ -76,8 +67,6 @@ typedef u32 acpi_status;
76#endif 67#endif
77static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags) 68static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
78{return AE_ERROR;} 69{return AE_ERROR;}
79static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;}
80static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}
81static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) 70static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
82{ return NULL; } 71{ return NULL; }
83#endif 72#endif