lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] PCI: fix namespace clashes

Browse Source 
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Rajesh Shah
2005-11-07 13:37:36 -08:00
committed by Greg Kroah-Hartman
parent b4033c1715
commit 6560aa5c43
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,8 @@ extern u8 pciehp_handle_power_fault (u8 hp_slot, void *inst_id);
/* pci functions */ /* pci functions */
extern int pciehp_configure_device (struct slot *p_slot); extern int pciehp_configure_device (struct slot *p_slot);
extern int pciehp_unconfigure_device (struct slot *p_slot); extern int pciehp_unconfigure_device (struct slot *p_slot);
extern int get_hp_hw_control_from_firmware(struct pci_dev *dev); extern int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev);
extern void get_hp_params_from_firmware(struct pci_dev *dev, extern void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp); struct hotplug_params *hpp);

2
drivers/pci/hotplug/pciehp_hpc.c
View File

@@ -1418,7 +1418,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
dbg("Bypassing BIOS check for pciehp use on %s\n", dbg("Bypassing BIOS check for pciehp use on %s\n",
pci_name(ctrl->pci_dev)); pci_name(ctrl->pci_dev));
} else { } else {
rc = get_hp_hw_control_from_firmware(ctrl->pci_dev); rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
if (rc) if (rc)
goto abort_free_ctlr; goto abort_free_ctlr;
} }

4
drivers/pci/hotplug/pciehprm_acpi.c
View File

@@ -169,7 +169,7 @@ static int is_root_bridge(acpi_handle handle)
return 0; return 0;
} }
int get_hp_hw_control_from_firmware(struct pci_dev *dev) int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
{ {
acpi_status status; acpi_status status;
acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev)); acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
@@ -228,7 +228,7 @@ int get_hp_hw_control_from_firmware(struct pci_dev *dev)
return -1; return -1;
} }
void get_hp_params_from_firmware(struct pci_dev *dev, void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp) struct hotplug_params *hpp)
{ {
acpi_status status = AE_NOT_FOUND; acpi_status status = AE_NOT_FOUND;

4
drivers/pci/hotplug/pciehprm_nonacpi.c
View File

@@ -35,13 +35,13 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "pciehp.h" #include "pciehp.h"
void get_hp_params_from_firmware(struct pci_dev *dev, void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp) struct hotplug_params *hpp)
{ {
return; return;
} }
int get_hp_hw_control_from_firmware(struct pci_dev *dev) int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
{ {
return 0; return 0;
} }