1 From 23616941914917cf25b94789856b5326b68d8ee8 Mon Sep 17 00:00:00 2001
2 From: Andrew Patterson <andrew.patterson@hp.com>
3 Date: Mon, 10 Nov 2008 15:31:10 -0700
4 Subject: ACPI/PCI: remove obsolete _OSC capability support functions
8 The acpi_query_osc, __pci_osc_support_set, pci_osc_support_set, and
9 pcie_osc_support_set functions have been obsoleted in favor of setting
10 these capabilities during root bridge discovery with
11 pci_acpi_osc_support. There are no longer any callers of these
12 functions, so remove them.
14 Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
15 Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 --- a/drivers/pci/pci-acpi.c
19 +++ b/drivers/pci/pci-acpi.c
20 @@ -173,32 +173,6 @@ out:
24 -static acpi_status acpi_query_osc(acpi_handle handle, u32 level,
25 - void *context, void **retval)
27 - pci_acpi_osc_support(handle, (unsigned long)context);
33 - * __pci_osc_support_set - register OS support to Firmware
34 - * @flags: OS support bits
37 - * Update OS support fields and doing a _OSC Query to obtain an update
38 - * from Firmware on supported control bits.
40 -acpi_status __pci_osc_support_set(u32 flags, const char *hid)
42 - if (!(flags & OSC_SUPPORT_MASKS))
45 - acpi_get_devices(hid, acpi_query_osc,
46 - (void *)(unsigned long)flags, NULL);
51 * pci_osc_control_set - commit requested control to Firmware
52 * @handle: acpi_handle for the target ACPI object
53 diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
54 index 424f06f..871e096 100644
55 --- a/include/linux/pci-acpi.h
56 +++ b/include/linux/pci-acpi.h
60 extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);
61 -extern acpi_status __pci_osc_support_set(u32 flags, const char *hid);
62 int pci_acpi_osc_support(acpi_handle handle, u32 flags);
63 -static inline acpi_status pci_osc_support_set(u32 flags)
65 - return __pci_osc_support_set(flags, PCI_ROOT_HID_STRING);
67 -static inline acpi_status pcie_osc_support_set(u32 flags)
69 - return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);
71 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
73 /* Find root host bridge */
74 @@ -76,8 +67,6 @@ typedef u32 acpi_status;
76 static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
78 -static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;}
79 -static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}
80 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)