Commit 6560aa5c authored by Rajesh Shah's avatar Rajesh Shah Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: fix namespace clashes 



Signed-off-by: default avatarRajesh Shah <rajesh.shah@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4033c17

drivers/pci/hotplug/pciehp.h

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ extern u8 pciehp_handle_power_fault (u8 hp_slot, void *inst_id); 
/* pci functions */

extern int	pciehp_configure_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 void	get_hp_params_from_firmware(struct pci_dev *dev,

extern int	pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev);

extern void	pciehp_get_hp_params_from_firmware(struct pci_dev *dev,

	       	struct hotplug_params *hpp);

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev) 
		dbg("Bypassing BIOS check for pciehp use on %s\n",

				pci_name(ctrl->pci_dev));

	} else {

		rc = get_hp_hw_control_from_firmware(ctrl->pci_dev);

		rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);

		if (rc)

			goto abort_free_ctlr;

	}

drivers/pci/hotplug/pciehprm_acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int is_root_bridge(acpi_handle handle) 
	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_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;

}



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)

{

	acpi_status status = AE_NOT_FOUND;

drivers/pci/hotplug/pciehprm_nonacpi.c

+2 −2
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ 
#include <linux/slab.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)

{

	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;

}