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

Commit 6f77fa49 authored by Mika Westerberg's avatar Mika Westerberg Committed by Bjorn Helgaas
Browse files

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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
[bhelgaas: split to separate patch]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent aa6be07c

drivers/pci/hotplug/acpi_pcihp.c

+1 −2
Original line number Diff line number Diff line
@@ -63,11 +63,10 @@ static acpi_status acpi_run_oshp(acpi_handle handle) 
/**

 * acpi_get_hp_hw_control_from_firmware

 * @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.

 */

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 acpi_pci_root *root;

drivers/pci/hotplug/shpchp.h

+1 −2
Original line number Diff line number Diff line
@@ -177,8 +177,7 @@ static inline const char *slot_name(struct slot *slot) 
#include <linux/pci-acpi.h>

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, flags);

	return acpi_get_hp_hw_control_from_firmware(dev);

}

#else

#define get_hp_hw_control_from_firmware(dev) (0)

include/linux/pci_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ struct hotplug_params { 
#include <linux/acpi.h>

int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);

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_detect_ejectable(acpi_handle handle);

#else