Commit 1423de71 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/ACPI: Make acpi_pci_osc_control_set() static 



acpi_pci_osc_control_set() is only called from pci_root.c, so stop
exporting it and make it static.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7c53f6b6

drivers/acpi/pci_root.c

+1 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev); 
 * _OSC bits the BIOS has granted control of, but its contents are meaningless

 * on failure.

 **/

acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)

static acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)

{

	struct acpi_pci_root *root;

	acpi_status status = AE_OK;
@@ -406,7 +406,6 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req) 
	mutex_unlock(&osc_lock);

	return status;

}

EXPORT_SYMBOL(acpi_pci_osc_control_set);



static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,

				 bool is_pcie)

include/linux/acpi.h

+0 −3
Original line number Diff line number Diff line
@@ -581,9 +581,6 @@ extern bool osc_pc_lpi_support_confirmed; 
#define ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES	0x0000000E

#define ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS	0x0000000F



extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,

					     u32 *mask, u32 req);



/* Enable _OST when all relevant hotplug operations are enabled */

#if defined(CONFIG_ACPI_HOTPLUG_CPU) &&			\

	defined(CONFIG_ACPI_HOTPLUG_MEMORY) &&		\