提交 6f77fa49 编写于 作者: M Mika Westerberg 提交者: Bjorn Helgaas

PCI: shpchp: Remove acpi_get_hp_hw_control_from_firmware() flags

acpi_get_hp_hw_control_from_firmware() no longer uses the flags parameter,
so remove it.
Signed-off-by: NMika Westerberg <mika.westerberg@linux.intel.com>
[bhelgaas: split to separate patch]
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 aa6be07c
...@@ -63,11 +63,10 @@ static acpi_status acpi_run_oshp(acpi_handle handle) ...@@ -63,11 +63,10 @@ static acpi_status acpi_run_oshp(acpi_handle handle)
/** /**
* acpi_get_hp_hw_control_from_firmware * acpi_get_hp_hw_control_from_firmware
* @dev: the pci_dev of the bridge that has a hotplug controller * @dev: the pci_dev of the bridge that has a hotplug controller
* @flags: requested control bits for _OSC
* *
* Attempt to take hotplug control from firmware. * Attempt to take hotplug control from firmware.
*/ */
int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags) int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev)
{ {
const struct pci_host_bridge *host; const struct pci_host_bridge *host;
const struct acpi_pci_root *root; const struct acpi_pci_root *root;
......
...@@ -177,8 +177,7 @@ static inline const char *slot_name(struct slot *slot) ...@@ -177,8 +177,7 @@ static inline const char *slot_name(struct slot *slot)
#include <linux/pci-acpi.h> #include <linux/pci-acpi.h>
static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev) static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)
{ {
u32 flags = OSC_PCI_SHPC_NATIVE_HP_CONTROL; return acpi_get_hp_hw_control_from_firmware(dev);
return acpi_get_hp_hw_control_from_firmware(dev, flags);
} }
#else #else
#define get_hp_hw_control_from_firmware(dev) (0) #define get_hp_hw_control_from_firmware(dev) (0)
......
...@@ -163,7 +163,7 @@ struct hotplug_params { ...@@ -163,7 +163,7 @@ struct hotplug_params {
#include <linux/acpi.h> #include <linux/acpi.h>
int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
bool pciehp_is_native(struct pci_dev *bridge); bool pciehp_is_native(struct pci_dev *bridge);
int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); int acpi_get_hp_hw_control_from_firmware(struct pci_dev *bridge);
int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
int acpi_pci_detect_ejectable(acpi_handle handle); int acpi_pci_detect_ejectable(acpi_handle handle);
#else #else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册