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

Commit e47034c7 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs 



Remove conditional code based on CONFIG_HOTPLUG being false.  It's
always on now in preparation of it going away as an option.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a6f19db

arch/powerpc/kernel/pci-common.c

+0 −4
Original line number Diff line number Diff line
@@ -1428,8 +1428,6 @@ void __init pcibios_resource_survey(void) 
		ppc_md.pcibios_fixup();

}



#ifdef CONFIG_HOTPLUG



/* This is used by the PCI hotplug driver to allocate resource

 * of newly plugged busses. We can try to consolidate with the

 * rest of the code later, for now, keep it as-is as our main
@@ -1488,8 +1486,6 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus) 
}

EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);



#endif /* CONFIG_HOTPLUG */



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	if (ppc_md.pcibios_enable_device_hook)

arch/powerpc/kernel/pci_64.c

+0 −4
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static int __init pcibios_init(void) 


subsys_initcall(pcibios_init);



#ifdef CONFIG_HOTPLUG



int pcibios_unmap_io_space(struct pci_bus *bus)

{

	struct pci_controller *hose;
@@ -124,8 +122,6 @@ int pcibios_unmap_io_space(struct pci_bus *bus) 
}

EXPORT_SYMBOL_GPL(pcibios_unmap_io_space);



#endif /* CONFIG_HOTPLUG */



static int __devinit pcibios_map_phb_io_space(struct pci_controller *hose)

{

	struct vm_struct *area;