Thread (5 messages) 5 messages, 2 authors, 2013-01-04

Re: [PATCH 1/2] EEH/OF: checking for CONFIG_EEH is not needed

From: Gavin Shan <hidden>
Date: 2013-01-04 02:24:45

On Fri, Dec 28, 2012 at 05:13:18PM -0200, Thadeu Lima de Souza Cascardo wrote:
The functions used are already defined as empty inline functions for the
case where EEH is disabled.

Signed-off-by: Thadeu Lima de Souza Cascardo <redacted>
Acked-by: Gavin Shan <redacted>
quoted hunk ↗ jump to hunk
---
arch/powerpc/kernel/of_platform.c |    4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 2049f2d..c5fc6b2 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -71,10 +71,8 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
	eeh_dev_phb_init_dynamic(phb);

	/* Register devices with EEH */
-#ifdef CONFIG_EEH
	if (dev->dev.of_node->child)
		eeh_add_device_tree_early(dev->dev.of_node);
-#endif /* CONFIG_EEH */

	/* Scan the bus */
	pcibios_scan_phb(phb);
@@ -88,9 +86,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
	pcibios_claim_one_bus(phb->bus);

	/* Finish EEH setup */
-#ifdef CONFIG_EEH
	eeh_add_device_tree_late(phb->bus);
-#endif

	/* Add probed PCI devices to the device model */
	pci_bus_add_devices(phb->bus);
Thanks,
Gavin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help