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

Commit 6a29172b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface 



This patch makes acpi_get_hp_params_from_firmware() take a
pci_dev rather than a pci_bus and makes it return a standard
int errno rather than acpi_status.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent fca6825a

drivers/pci/hotplug/acpi_pcihp.c

+7 −7
Original line number Diff line number Diff line
@@ -324,18 +324,18 @@ static acpi_status acpi_run_oshp(acpi_handle handle) 


/* acpi_get_hp_params_from_firmware

 *

 * @bus - the pci_bus of the bus on which the device is newly added

 * @dev - the pci_dev for which we want parameters

 * @hpp - allocated by the caller

 */

acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,

int acpi_get_hp_params_from_firmware(struct pci_dev *dev,

		struct hotplug_params *hpp)

{

	acpi_status status = AE_NOT_FOUND;

	acpi_status status;

	acpi_handle handle, phandle;

	struct pci_bus *pbus;



	handle = NULL;

	for (pbus = bus; pbus; pbus = pbus->parent) {

	for (pbus = dev->bus; pbus; pbus = pbus->parent) {

		handle = acpi_pci_get_bridge_handle(pbus);

		if (handle)

			break;
@@ -350,10 +350,10 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, 
	while (handle) {

		status = acpi_run_hpx(handle, hpp);

		if (ACPI_SUCCESS(status))

			break;

			return 0;

		status = acpi_run_hpp(handle, hpp);

		if (ACPI_SUCCESS(status))

			break;

			return 0;

		if (acpi_is_root_bridge(handle))

			break;

		status = acpi_get_parent(handle, &phandle);
@@ -361,7 +361,7 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, 
			break;

		handle = phandle;

	}

	return status;

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);

drivers/pci/hotplug/acpiphp_glue.c

+3 −4
Original line number Diff line number Diff line
@@ -275,11 +275,10 @@ static int detect_ejectable_slots(acpi_handle handle) 
/* decode ACPI 2.0 _HPP hot plug parameters */

static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp)

{

	acpi_status status;

	int ret;



	status = acpi_get_hp_params_from_firmware(dev->bus, hpp);

	if (ACPI_FAILURE(status) ||

	    !hpp->t0 || (hpp->t0->revision > 1)) {

	ret = acpi_get_hp_params_from_firmware(dev, hpp);

	if (ret || !hpp->t0 || (hpp->t0->revision > 1)) {

		/* use default numbers */

		printk(KERN_WARNING

		       "%s: Could not get hotplug parameters. Use defaults\n",

drivers/pci/hotplug/pciehp.h

+1 −3
Original line number Diff line number Diff line
@@ -241,9 +241,7 @@ static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev) 
static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,

			struct hotplug_params *hpp)

{

	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))

		return -ENODEV;

	return 0;

	return acpi_get_hp_params_from_firmware(dev, hpp);

}

#else

#define pciehp_firmware_init()				do {} while (0)

drivers/pci/hotplug/shpchp.h

+1 −3
Original line number Diff line number Diff line
@@ -191,9 +191,7 @@ static inline const char *slot_name(struct slot *slot) 
static inline int get_hp_params_from_firmware(struct pci_dev *dev,

					      struct hotplug_params *hpp)

{

	if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))

			return -ENODEV;

	return 0;

	return acpi_get_hp_params_from_firmware(dev, hpp);

}



static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)

include/linux/pci_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct hotplug_params { 
#ifdef CONFIG_ACPI

#include <acpi/acpi.h>

#include <acpi/acpi_bus.h>

extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,

int acpi_get_hp_params_from_firmware(struct pci_dev *dev,

				struct hotplug_params *hpp);

int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);

int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);