Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215ee763 authored by Rob Herring's avatar Rob Herring Committed by Michael Ellerman
Browse files

powerpc: pseries: remove dlpar_attach_node dependency on full path 



In preparation to stop storing the full node path in full_name, remove the
dependency on full_name from dlpar_attach_node(). Callers of
dlpar_attach_node() already have the parent device_node, so just pass the
parent node into dlpar_attach_node instead of the path. This avoids doing
a lookup of the parent node by the path.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b7c670d6

arch/powerpc/platforms/pseries/dlpar.c

+2 −4
Original line number Diff line number Diff line
@@ -254,13 +254,11 @@ struct device_node *dlpar_configure_connector(__be32 drc_index, 
	return first_dn;

}



int dlpar_attach_node(struct device_node *dn)

int dlpar_attach_node(struct device_node *dn, struct device_node *parent)

{

	int rc;



	dn->parent = pseries_of_derive_parent(dn->full_name);

	if (IS_ERR(dn->parent))

		return PTR_ERR(dn->parent);

	dn->parent = parent;



	rc = of_attach_node(dn);

	if (rc) {

arch/powerpc/platforms/pseries/hotplug-cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static ssize_t dlpar_cpu_add(u32 drc_index) 
		return -EINVAL;

	}



	rc = dlpar_attach_node(dn);

	rc = dlpar_attach_node(dn, parent);

	if (rc) {

		saved_rc = rc;

		pr_warn("Failed to attach node %s, rc: %d, drc index: %x\n",

arch/powerpc/platforms/pseries/mobility.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int add_dt_node(__be32 parent_phandle, __be32 drc_index) 
	if (!dn)

		return -ENOENT;



	rc = dlpar_attach_node(dn);

	rc = dlpar_attach_node(dn, parent_dn);

	if (rc)

		dlpar_free_cc_nodes(dn);

arch/powerpc/platforms/pseries/pseries.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ extern void dlpar_free_cc_nodes(struct device_node *); 
extern void dlpar_free_cc_property(struct property *);

extern struct device_node *dlpar_configure_connector(__be32,

						struct device_node *);

extern int dlpar_attach_node(struct device_node *);

extern int dlpar_attach_node(struct device_node *, struct device_node *);

extern int dlpar_detach_node(struct device_node *);

extern int dlpar_acquire_drc(u32 drc_index);

extern int dlpar_release_drc(u32 drc_index);