Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23616941 authored by Andrew Patterson's avatar Andrew Patterson Committed by Jesse Barnes
Browse files

ACPI/PCI: remove obsolete _OSC capability support functions 



The acpi_query_osc, __pci_osc_support_set, pci_osc_support_set, and
pcie_osc_support_set functions have been obsoleted in favor of setting
these capabilities during root bridge discovery with
pci_acpi_osc_support.  There are no longer any callers of these
functions, so remove them.

Signed-off-by: default avatarAndrew Patterson <andrew.patterson@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 07ae95f9

drivers/pci/pci-acpi.c

+0 −25
Original line number Diff line number Diff line
@@ -175,31 +175,6 @@ int pci_acpi_osc_support(acpi_handle handle, u32 flags) 
	return rc;

}



static acpi_status acpi_query_osc(acpi_handle handle, u32 level,

				  void *context, void **retval)

{

	pci_acpi_osc_support(handle, (unsigned long)context);

	return AE_OK;

}



/**

 * __pci_osc_support_set - register OS support to Firmware

 * @flags: OS support bits

 * @hid: hardware ID

 *

 * Update OS support fields and doing a _OSC Query to obtain an update

 * from Firmware on supported control bits.

 **/

acpi_status __pci_osc_support_set(u32 flags, const char *hid)

{

	if (!(flags & OSC_SUPPORT_MASKS))

		return AE_TYPE;



	acpi_get_devices(hid, acpi_query_osc,

			 (void *)(unsigned long)flags, NULL);

	return AE_OK;

}



/**

 * pci_osc_control_set - commit requested control to Firmware

 * @handle: acpi_handle for the target ACPI object

include/linux/pci-acpi.h

+0 −11
Original line number Diff line number Diff line
@@ -50,16 +50,7 @@ 


#ifdef CONFIG_ACPI

extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);

extern acpi_status __pci_osc_support_set(u32 flags, const char *hid);

int pci_acpi_osc_support(acpi_handle handle, u32 flags);

static inline acpi_status pci_osc_support_set(u32 flags)

{

	return __pci_osc_support_set(flags, PCI_ROOT_HID_STRING);

}

static inline acpi_status pcie_osc_support_set(u32 flags)

{

	return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);

}

static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)

{

	/* Find root host bridge */
@@ -76,8 +67,6 @@ typedef u32 acpi_status; 
#endif    

static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)

{return AE_ERROR;}

static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;} 

static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}

static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)

{ return NULL; }

#endif