of: unify phandle name in struct device_node
In struct device_node, the phandle is named 'linux_phandle' for PowerPC and MicroBlaze, and 'node' for SPARC. There is no good reason for the difference, it is just an artifact of the code diverging over a couple of years. This patch renames both to simply .phandle. Note: the .node also existed in PowerPC/MicroBlaze, but the only user seems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn't look like the assignment between .linux_phandle and .node is significantly different enough to warrant the separate code paths unless ibm,phandle properties actually appear in Apple device trees. I think it is safe to eliminate the old .node property and use phandle everywhere. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net> Tested-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
@@ -768,7 +768,7 @@ static int check_codec(struct aoa_codec *codec,
|
||||
"required property %s not present\n", propname);
|
||||
return -ENODEV;
|
||||
}
|
||||
if (*ref != codec->node->linux_phandle) {
|
||||
if (*ref != codec->node->phandle) {
|
||||
printk(KERN_INFO "snd-aoa-fabric-layout: "
|
||||
"%s doesn't match!\n", propname);
|
||||
return -ENODEV;
|
||||
|
||||
Reference in New Issue
Block a user