[PATCH 1/9] microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
Bill Pemberton
wfp5p at virginia.edu
Thu Nov 22 07:34:52 EST 2012
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: Bill Pemberton <wfp5p at virginia.edu>
Cc: Bjorn Helgaas <bhelgaas at google.com>
Cc: Michal Simek <monstr at monstr.eu>
Cc: Grant Likely <grant.likely at secretlab.ca>
Cc: Rob Herring <rob.herring at calxeda.com>
Cc: microblaze-uclinux at itee.uq.edu.au
Cc: devicetree-discuss at lists.ozlabs.org
---
arch/microblaze/pci/pci-common.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 4dbb505..a1c5b99 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -1346,8 +1346,6 @@ void __init pcibios_resource_survey(void)
pci_assign_unassigned_resources();
}
-#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
@@ -1407,8 +1405,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)
{
return pci_enable_resources(dev, mask);
--
1.8.0
More information about the devicetree-discuss
mailing list