1 files changed, 2 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/4xx/pci.c b/arch/powerpc/platforms/4xx/pci.c
index 5aca523551ae..e6e2adcc7b64 100644
--- a/arch/powerpc/platforms/4xx/pci.c
+++ b/arch/powerpc/platforms/4xx/pci.c
@@ -1399,7 +1399,6 @@ static void __init ppc_476fpe_pciex_check_link(struct ppc4xx_pciex_port *port)
                 printk(KERN_WARNING "PCIE%d: Link up failed\n", port->index);
 
         iounmap(mbase);
-        return;
 }
 
 static struct ppc4xx_pciex_hwops ppc_476fpe_pcie_hwops __initdata =
@@ -2081,7 +2080,6 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
         const u32 *pval;
         int portno;
         unsigned int dcrs;
-        const char *val;
 
         /* First, proceed to core initialization as we assume there's
          * only one PCIe core in the system
@@ -2127,10 +2125,9 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
          * Resulting from this setup this PCIe port will be configured
          * as root-complex or as endpoint.
          */
-        val = of_get_property(port->node, "device_type", NULL);
-        if (!strcmp(val, "pci-endpoint")) {
+        if (of_node_is_type(port->node, "pci-endpoint")) {
                 port->endpoint = 1;
-        } else if (!strcmp(val, "pci")) {
+        } else if (of_node_is_type(port->node, "pci")) {
                 port->endpoint = 0;
         } else {
                 printk(KERN_ERR "PCIE: missing or incorrect device_type for %pOF\n",