powerpc: Change CONFIG_E500 to CONFIG_PPC_E500

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index af6c8ca824d399ac6400b412f1b064ce1c4277b6..974d3db6faab237dc7d56ce5a89eb0420e8e8c31 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -181,6 +181,7 @@ static int setup_one_atmu(struct ccsr_pci __iomem *pci,
 static bool is_kdump(void)
 {
        struct device_node *node;
+       bool ret;
 
        node = of_find_node_by_type(NULL, "memory");
        if (!node) {
@@ -188,7 +189,10 @@ static bool is_kdump(void)
                return false;
        }
 
-       return of_property_read_bool(node, "linux,usable-memory");
+       ret = of_property_read_bool(node, "linux,usable-memory");
+       of_node_put(node);
+
+       return ret;
 }
 
 /* atmu setup for fsl pci/pcie controller */
@@ -939,7 +943,7 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose)
        return 0;
 }
 
-#ifdef CONFIG_E500
+#ifdef CONFIG_PPC_E500
 static int mcheck_handle_load(struct pt_regs *regs, u32 inst)
 {
        unsigned int rd, ra, rb, d;
@@ -1142,7 +1146,6 @@ void __init fsl_pci_assign_primary(void)
        for_each_matching_node(np, pci_ids) {
                if (of_device_is_available(np)) {
                        fsl_pci_primary = np;
-                       of_node_put(np);
                        return;
                }
        }