]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
powerpc/eeh/of: Checking for CONFIG_EEH is not needed
authorThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Fri, 28 Dec 2012 09:13:18 +0000 (09:13 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 10 Jan 2013 06:01:56 +0000 (17:01 +1100)
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>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/of_platform.c

index 07c12697d7083cb0645a3f4eb90cd0d94725d108..71c0469ab7fc63c5b74a3808209c9ca079ce1f4c 100644 (file)
@@ -71,10 +71,8 @@ static int 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 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);