Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface

Browse source 
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: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2009-09-14 16:35:15 -06:00 committed by Jesse Barnes
parent fca6825ad7
commit 6a29172ba9
5 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/pci/hotplug/acpi_pcihp.c
View file

@ -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);

7
drivers/pci/hotplug/acpiphp_glue.c
View file

@ -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",

4
drivers/pci/hotplug/pciehp.h
View file

@ -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)

4
drivers/pci/hotplug/shpchp.h
View file

@ -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)

2
include/linux/pci_hotplug.h
View file

@ -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);