diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index b2593e8..39ddbdf 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -92,7 +92,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state);
 /* rpaphp_core.c */
 int rpaphp_add_slot(struct device_node *dn);
 int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
-		char **drc_name, char **drc_type, int *drc_power_domain);
+		char **drc_name, char **drc_type, int *drc_power);
 
 /* rpaphp_slot.c */
 void dealloc_slot_struct(struct slot *slot);
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index ff800df..a639c5c 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -165,119 +165,76 @@ static enum pci_bus_speed get_max_bus_speed(struct slot *slot)
 	return speed;
 }
 
-static int get_children_props(struct device_node *dn, const int **drc_indexes,
-		const int **drc_names, const int **drc_types,
-		const int **drc_power_domains)
+static int parse_drc_props(struct device_node *dn, u32 drc_index,
+			   char **drc_name, char **drc_type, u32 *drc_power)
 {
-	const int *indexes, *names, *types, *domains;
+	const u32 *indexes, *names, *types, *domains;
+	char *name, *type;
+	struct device_node *parent = dn;
+	u32 i;
+
+	while ((parent = of_get_parent(parent))) {
+		indexes = of_get_property(parent, "ibm,drc-indexes", NULL);
+		names   = of_get_property(parent, "ibm,drc-names", NULL);
+		types   = of_get_property(parent, "ibm,drc-types", NULL);
+		domains = of_get_property(parent, "ibm,drc-power-domains", NULL);
+
+		if (!indexes || !names || !types || !domains) {
+			of_node_put(parent);
+			continue;
+		}
 
-	indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
-	names = of_get_property(dn, "ibm,drc-names", NULL);
-	types = of_get_property(dn, "ibm,drc-types", NULL);
-	domains = of_get_property(dn, "ibm,drc-power-domains", NULL);
+		name = (char *)&names[1];
+		type = (char *)&types[1];
+		for (i = 0; i < be32_to_cpu(indexes[0]); i++) {
+			if (be32_to_cpu(indexes[i + 1]) != drc_index) {
+				name += (strlen(name) + 1);
+				type += (strlen(type) + 1);
+				continue;
+			}
 
-	/* Slot does not have dynamically-removable children */
-	if (!indexes || !names || !types || !domains)
-		return -EINVAL;
+			/* Matched index */
+			if (drc_name)
+				*drc_name = name;
+			if (drc_type)
+				*drc_type = type;
+			if (drc_power)
+				*drc_power = be32_to_cpu(domains[i + 1]);
+
+			of_node_put(parent);
+			return 0;
+		}
 
-	if (drc_indexes)
-		*drc_indexes = indexes;
-	/* &drc_names[1] contains NULL terminated slot names */
-	if (drc_names)
-		*drc_names = names;
-	/* &drc_types[1] contains NULL terminated slot types */
-	if (drc_types)
-		*drc_types = types;
-	if (drc_power_domains)
-		*drc_power_domains = domains;
+		/* Next level parent */
+		of_node_put(parent);
+	}
 
-	return 0;
+	return -ENODEV;
 }
 
-/* To get the DRC props describing the current node, first obtain it's
+/*
+ * To get the DRC props describing the current node, first obtain it's
  * my-drc-index property.  Next obtain the DRC list from it's parent.  Use
  * the my-drc-index for correlation, and obtain the requested properties.
  */
 int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
-		char **drc_name, char **drc_type, int *drc_power_domain)
+			 char **drc_name, char **drc_type, int *drc_power)
 {
-	const int *indexes, *names;
-	const int *types, *domains;
-	const unsigned int *my_index;
-	char *name_tmp, *type_tmp;
-	int i, rc;
+	const u32 *my_index;
 
+	/* Check if node is capable of hotplug */
 	my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
-	/* Node isn't DLPAR/hotplug capable */
 	if (!my_index)
 		return -EINVAL;
+	if (drc_index)
+		*drc_index = be32_to_cpu(*my_index);
 
-	rc = get_children_props(dn->parent, &indexes, &names, &types, &domains);
-	if (rc < 0)
-		return -EINVAL;
-
-	name_tmp = (char *) &names[1];
-	type_tmp = (char *) &types[1];
-
-	/* Iterate through parent properties, looking for my-drc-index */
-	for (i = 0; i < be32_to_cpu(indexes[0]); i++) {
-		if ((unsigned int) indexes[i + 1] == *my_index) {
-			if (drc_name)
-				*drc_name = name_tmp;
-			if (drc_type)
-				*drc_type = type_tmp;
-			if (drc_index)
-				*drc_index = be32_to_cpu(*my_index);
-			if (drc_power_domain)
-				*drc_power_domain = be32_to_cpu(domains[i+1]);
-			return 0;
-		}
-		name_tmp += (strlen(name_tmp) + 1);
-		type_tmp += (strlen(type_tmp) + 1);
-	}
-
-	return -EINVAL;
+	return parse_drc_props(dn, be32_to_cpu(*my_index),
+			       drc_name, drc_type, drc_power);
 }
 EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);
 
 /**
- * is_php_dn() - return true if this is a hotpluggable pci slot, else false
- * @dn: target &device_node
- * @indexes: passed to get_children_props()
- * @names: passed to get_children_props()
- * @types: returned from get_children_props()
- * @power_domains:
- *
- * This routine will return true only if the device node is
- * a hotpluggable slot. This routine will return false
- * for built-in pci slots (even when the built-in slots are
- * dlparable.)
- */
-static bool is_php_dn(struct device_node *dn,
-		      const int **indexes, const int **names,
-		      const int **types, const int **power_domains)
-{
-	const int *drc_types;
-	const char *drc_type_str;
-	char *endptr;
-	unsigned long val;
-	int rc;
-
-	rc = get_children_props(dn, indexes, names, &drc_types, power_domains);
-	if (rc < 0)
-		return false;
-
-	/* PCI Hotplug nodes have an integer for drc_type */
-	drc_type_str = (char *)&drc_types[1];
-	val = simple_strtoul(drc_type_str, &endptr, 10);
-	if (endptr == drc_type_str)
-		return false;
-
-	*types = drc_types;
-	return true;
-}
-
-/**
  * rpaphp_add_slot -- declare a hotplug slot to the hotplug subsystem.
  * @dn: device node of slot
  *
@@ -295,52 +252,36 @@ static bool is_php_dn(struct device_node *dn,
  */
 int rpaphp_add_slot(struct device_node *dn)
 {
+	char *name, *type, *endptr;
+	int index, power_domain;
 	struct slot *slot;
-	int retval = 0;
-	int i;
-	const int *indexes, *names, *types, *power_domains;
-	char *name, *type;
-
-	if (!dn->name || strcmp(dn->name, "pci"))
-		return 0;
+	int val, ret;
 
-	/* If this is not a hotplug slot, return without doing anything. */
-	if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
-		return 0;
-
-	dbg("Entry %s: dn->full_name=%s\n", __func__, dn->full_name);
-
-	/* register PCI devices */
-	name = (char *) &names[1];
-	type = (char *) &types[1];
-	for (i = 0; i < be32_to_cpu(indexes[0]); i++) {
-		int index;
-
-		index = be32_to_cpu(indexes[i + 1]);
-		slot = alloc_slot_struct(dn, index, name,
-					 be32_to_cpu(power_domains[i + 1]));
-		if (!slot)
-			return -ENOMEM;
-
-		slot->type = simple_strtoul(type, NULL, 10);
-
-		dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
-				index, name, type);
+	/* Get and parse the hotplug properties */
+	ret = rpaphp_get_drc_props(dn, &index, &name, &type, &power_domain);
+	if (ret)
+		return ret;
 
-		retval = rpaphp_enable_slot(slot);
-		if (!retval)
-			retval = rpaphp_register_slot(slot);
+	/* PCI Hotplug nodes have an integer for drc_type */
+	val = simple_strtoul(type, &endptr, 10);
+	if (endptr == type)
+		return -EINVAL;
 
-		if (retval)
-			dealloc_slot_struct(slot);
+	slot = alloc_slot_struct(dn, index, name, power_domain);
+	if (!slot)
+		return -ENOMEM;
 
-		name += strlen(name) + 1;
-		type += strlen(type) + 1;
-	}
-	dbg("%s - Exit: rc[%d]\n", __func__, retval);
+	slot->type = val;
+	ret = rpaphp_enable_slot(slot);
+	if (!ret)
+		ret = rpaphp_register_slot(slot);
+	if (ret)
+		goto fail;
 
-	/* XXX FIXME: reports a failure only if last entry in loop failed */
-	return retval;
+	return 0;
+fail:
+	dealloc_slot_struct(slot);
+	return ret;
 }
 EXPORT_SYMBOL_GPL(rpaphp_add_slot);
 
