powerpc: Use of_node_name_eq for node name comparisons
Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. A couple of open coded iterating thru the child node names are converted to use for_each_child_of_node() instead. Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:

committed by
Michael Ellerman

parent
0d1223dd92
commit
2c8e65b595
@@ -131,7 +131,7 @@ static int cell_setup_phb(struct pci_controller *phb)
|
||||
|
||||
np = phb->dn;
|
||||
model = of_get_property(np, "model", NULL);
|
||||
if (model == NULL || strcmp(np->name, "pci"))
|
||||
if (model == NULL || !of_node_name_eq(np, "pci"))
|
||||
return 0;
|
||||
|
||||
/* Setup workarounds for spider */
|
||||
|
@@ -458,7 +458,6 @@ static void init_affinity_node(int cbe)
|
||||
struct device_node *vic_dn, *last_spu_dn;
|
||||
phandle avoid_ph;
|
||||
const phandle *vic_handles;
|
||||
const char *name;
|
||||
int lenp, i, added;
|
||||
|
||||
last_spu = list_first_entry(&cbe_spu_info[cbe].spus, struct spu,
|
||||
@@ -480,12 +479,7 @@ static void init_affinity_node(int cbe)
|
||||
if (!vic_dn)
|
||||
continue;
|
||||
|
||||
/* a neighbour might be spe, mic-tm, or bif0 */
|
||||
name = of_get_property(vic_dn, "name", NULL);
|
||||
if (!name)
|
||||
continue;
|
||||
|
||||
if (strcmp(name, "spe") == 0) {
|
||||
if (of_node_name_eq(vic_dn, "spe") ) {
|
||||
spu = devnode_spu(cbe, vic_dn);
|
||||
avoid_ph = last_spu_dn->phandle;
|
||||
} else {
|
||||
@@ -498,7 +492,7 @@ static void init_affinity_node(int cbe)
|
||||
spu = neighbour_spu(cbe, vic_dn, last_spu_dn);
|
||||
if (!spu)
|
||||
continue;
|
||||
if (!strcmp(name, "mic-tm")) {
|
||||
if (of_node_name_eq(vic_dn, "mic-tm")) {
|
||||
last_spu->has_mem_affinity = 1;
|
||||
spu->has_mem_affinity = 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user