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

login
register
mail settings
Submitter Thadeu Lima de Souza Cascardo
Date Dec. 28, 2012, 7:13 p.m.
Message ID <1356721999-25159-1-git-send-email-cascardo@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/208528/
State Accepted, archived
Commit d35d1424045df0a8ce125c7de59b4e7ad3c873fb
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Thadeu Lima de Souza Cascardo - Dec. 28, 2012, 7:13 p.m.
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 <cascardo@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/of_platform.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
Gavin Shan - Jan. 4, 2013, 2:24 a.m.
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 <cascardo@linux.vnet.ibm.com>

Acked-by: Gavin Shan <shangw@linux.vnet.ibm.com>

>---
> 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

Patch

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);