* [PATCH 1/9] microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
[not found] <1353530100-728-1-git-send-email-wfp5p@virginia.edu>
@ 2012-11-21 20:34 ` Bill Pemberton
2012-11-21 20:34 ` [PATCH 2/9] mips/PCI: " Bill Pemberton
2012-11-21 20:34 ` [PATCH 3/9] powerpc/PCI: " Bill Pemberton
2 siblings, 0 replies; 3+ messages in thread
From: Bill Pemberton @ 2012-11-21 20:34 UTC (permalink / raw)
To: gregkh
Cc: linux-pci, Bjorn Helgaas, Michal Simek, Grant Likely, Rob Herring,
microblaze-uclinux, devicetree-discuss
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@virginia.edu>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: devicetree-discuss@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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/9] mips/PCI: Remove CONFIG_HOTPLUG ifdefs
[not found] <1353530100-728-1-git-send-email-wfp5p@virginia.edu>
2012-11-21 20:34 ` [PATCH 1/9] microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs Bill Pemberton
@ 2012-11-21 20:34 ` Bill Pemberton
2012-11-21 20:34 ` [PATCH 3/9] powerpc/PCI: " Bill Pemberton
2 siblings, 0 replies; 3+ messages in thread
From: Bill Pemberton @ 2012-11-21 20:34 UTC (permalink / raw)
To: gregkh
Cc: linux-pci, Bjorn Helgaas, Ralf Baechle, Grant Likely, Rob Herring,
linux-mips, devicetree-discuss
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@virginia.edu>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
---
arch/mips/pci/pci.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 04e35bc..4040416 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -313,10 +313,8 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
}
}
-#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(PCIBIOS_MIN_IO);
EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
-#endif
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine)
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/9] powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs
[not found] <1353530100-728-1-git-send-email-wfp5p@virginia.edu>
2012-11-21 20:34 ` [PATCH 1/9] microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs Bill Pemberton
2012-11-21 20:34 ` [PATCH 2/9] mips/PCI: " Bill Pemberton
@ 2012-11-21 20:34 ` Bill Pemberton
2 siblings, 0 replies; 3+ messages in thread
From: Bill Pemberton @ 2012-11-21 20:34 UTC (permalink / raw)
To: gregkh
Cc: linux-pci, Benjamin Herrenschmidt, Paul Mackerras, Grant Likely,
Rob Herring, Bjorn Helgaas, linuxppc-dev, devicetree-discuss
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@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>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: devicetree-discuss@lists.ozlabs.org
---
arch/powerpc/kernel/pci-common.c | 4 ----
arch/powerpc/kernel/pci_64.c | 4 ----
2 files changed, 8 deletions(-)
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7f94f76..abc0d08 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -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)
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 4ff190f..2cbe676 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -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;
--
1.8.0
^ permalink raw reply related [flat|nested] 3+ messages in thread