diff for duplicates of <20091124215908.559.23998.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index d563261..571de70 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,8 +41,8 @@ index acf4574..1c6d684 100644 static int of_dev_phandle_match(struct device *dev, void *data) { phandle *ph = data; -- return to_of_device(dev)->node->linux_phandle == *ph; -+ return to_of_device(dev)->node->phandle == *ph; +- return to_of_device(dev)->node->linux_phandle = *ph; ++ return to_of_device(dev)->node->phandle = *ph; } struct of_device *of_find_device_by_phandle(phandle ph) @@ -54,8 +54,8 @@ index 1f79e4d..9b4a20b 100644 read_lock(&devtree_lock); for (np = allnodes; np != NULL; np = np->allnext) -- if (np->linux_phandle == handle) -+ if (np->phandle == handle) +- if (np->linux_phandle = handle) ++ if (np->phandle = handle) break; of_node_get(np); read_unlock(&devtree_lock); @@ -67,8 +67,8 @@ index 1a4fc0d..666d08d 100644 static int of_dev_phandle_match(struct device *dev, void *data) { phandle *ph = data; -- return to_of_device(dev)->node->linux_phandle == *ph; -+ return to_of_device(dev)->node->phandle == *ph; +- return to_of_device(dev)->node->linux_phandle = *ph; ++ return to_of_device(dev)->node->phandle = *ph; } struct of_device *of_find_device_by_phandle(phandle ph) @@ -80,8 +80,8 @@ index 7d0beeb..d3ce311 100644 read_lock(&devtree_lock); for (np = allnodes; np != 0; np = np->allnext) -- if (np->linux_phandle == handle) -+ if (np->phandle == handle) +- if (np->linux_phandle = handle) ++ if (np->phandle = handle) break; of_node_get(np); read_unlock(&devtree_lock); @@ -105,14 +105,14 @@ index 4c506c1..891f18e 100644 continue; vic_handles = of_get_property(spu_dn, "vicinity", &lenp); for (i=0; i < (lenp / sizeof(phandle)); i++) { -- if (vic_handles[i] == target->linux_phandle) -+ if (vic_handles[i] == target->phandle) +- if (vic_handles[i] = target->linux_phandle) ++ if (vic_handles[i] = target->phandle) return spu; } } @@ -499,7 +499,7 @@ static void init_affinity_node(int cbe) - if (strcmp(name, "spe") == 0) { + if (strcmp(name, "spe") = 0) { spu = devnode_spu(cbe, vic_dn); - avoid_ph = last_spu_dn->linux_phandle; + avoid_ph = last_spu_dn->phandle; @@ -139,7 +139,7 @@ index 96d5ce5..ede49e7 100644 - if (func->phandle && target->node != func->phandle) + if (func->phandle && target->phandle != func->phandle) continue; - if ((func->flags & flags) == 0) + if ((func->flags & flags) = 0) continue; diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c index b171ae8..b062de9 100644 @@ -188,8 +188,8 @@ index d80a65d..5832e13 100644 struct device_node *np; for (np = allnodes; np; np = np->allnext) -- if (np->node == handle) -+ if (np->phandle == handle) +- if (np->node = handle) ++ if (np->phandle = handle) break; return np; @@ -240,14 +240,14 @@ index 6164781..13c69e0 100644 @@ -315,12 +315,11 @@ unsigned long __init unflatten_dt_node(unsigned long mem, __alignof__(struct property)); if (allnextpp) { - if (strcmp(pname, "linux,phandle") == 0) { + if (strcmp(pname, "linux,phandle") = 0) { - np->node = *((u32 *)*p); -- if (np->linux_phandle == 0) +- if (np->linux_phandle = 0) - np->linux_phandle = np->node; -+ if (np->phandle == 0) ++ if (np->phandle = 0) + np->phandle = *((u32 *)*p); } - if (strcmp(pname, "ibm,phandle") == 0) + if (strcmp(pname, "ibm,phandle") = 0) - np->linux_phandle = *((u32 *)*p); + np->phandle = *((u32 *)*p); pp->name = pname; @@ -310,8 +310,8 @@ index 913b4a4..bb20987 100644 } dp = pci_device_to_OF_node(pdev); -- if (node == dp->node) { -+ if (node == dp->phandle) { +- if (node = dp->node) { ++ if (node = dp->phandle) { struct fb_var_screeninfo *var = &default_var; unsigned int N, P, Q, M, T, R; u32 v_total, h_total; diff --git a/a/content_digest b/N1/content_digest index a3ba9b7..c6da2af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,13 @@ "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH v2 11/11] of: unify phandle name in struct device_node\0" - "Date\0Tue, 24 Nov 2009 15:01:14 -0700\0" + "Date\0Tue, 24 Nov 2009 22:01:14 +0000\0" "To\0linuxppc-dev@lists.ozlabs.org" devicetree-discuss@lists.ozlabs.org sparclinux@vger.kernel.org microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "In struct device_node, the phandle is named 'linux_phandle' for PowerPC\n" @@ -54,8 +53,8 @@ " static int of_dev_phandle_match(struct device *dev, void *data)\n" " {\n" " \tphandle *ph = data;\n" - "-\treturn to_of_device(dev)->node->linux_phandle == *ph;\n" - "+\treturn to_of_device(dev)->node->phandle == *ph;\n" + "-\treturn to_of_device(dev)->node->linux_phandle = *ph;\n" + "+\treturn to_of_device(dev)->node->phandle = *ph;\n" " }\n" " \n" " struct of_device *of_find_device_by_phandle(phandle ph)\n" @@ -67,8 +66,8 @@ " \n" " \tread_lock(&devtree_lock);\n" " \tfor (np = allnodes; np != NULL; np = np->allnext)\n" - "-\t\tif (np->linux_phandle == handle)\n" - "+\t\tif (np->phandle == handle)\n" + "-\t\tif (np->linux_phandle = handle)\n" + "+\t\tif (np->phandle = handle)\n" " \t\t\tbreak;\n" " \tof_node_get(np);\n" " \tread_unlock(&devtree_lock);\n" @@ -80,8 +79,8 @@ " static int of_dev_phandle_match(struct device *dev, void *data)\n" " {\n" " \tphandle *ph = data;\n" - "-\treturn to_of_device(dev)->node->linux_phandle == *ph;\n" - "+\treturn to_of_device(dev)->node->phandle == *ph;\n" + "-\treturn to_of_device(dev)->node->linux_phandle = *ph;\n" + "+\treturn to_of_device(dev)->node->phandle = *ph;\n" " }\n" " \n" " struct of_device *of_find_device_by_phandle(phandle ph)\n" @@ -93,8 +92,8 @@ " \n" " \tread_lock(&devtree_lock);\n" " \tfor (np = allnodes; np != 0; np = np->allnext)\n" - "-\t\tif (np->linux_phandle == handle)\n" - "+\t\tif (np->phandle == handle)\n" + "-\t\tif (np->linux_phandle = handle)\n" + "+\t\tif (np->phandle = handle)\n" " \t\t\tbreak;\n" " \tof_node_get(np);\n" " \tread_unlock(&devtree_lock);\n" @@ -118,14 +117,14 @@ " \t\t\tcontinue;\n" " \t\tvic_handles = of_get_property(spu_dn, \"vicinity\", &lenp);\n" " \t\tfor (i=0; i < (lenp / sizeof(phandle)); i++) {\n" - "-\t\t\tif (vic_handles[i] == target->linux_phandle)\n" - "+\t\t\tif (vic_handles[i] == target->phandle)\n" + "-\t\t\tif (vic_handles[i] = target->linux_phandle)\n" + "+\t\t\tif (vic_handles[i] = target->phandle)\n" " \t\t\t\treturn spu;\n" " \t\t}\n" " \t}\n" "@@ -499,7 +499,7 @@ static void init_affinity_node(int cbe)\n" " \n" - " \t\t\tif (strcmp(name, \"spe\") == 0) {\n" + " \t\t\tif (strcmp(name, \"spe\") = 0) {\n" " \t\t\t\tspu = devnode_spu(cbe, vic_dn);\n" "-\t\t\t\tavoid_ph = last_spu_dn->linux_phandle;\n" "+\t\t\t\tavoid_ph = last_spu_dn->phandle;\n" @@ -152,7 +151,7 @@ "-\t\tif (func->phandle && target->node != func->phandle)\n" "+\t\tif (func->phandle && target->phandle != func->phandle)\n" " \t\t\tcontinue;\n" - " \t\tif ((func->flags & flags) == 0)\n" + " \t\tif ((func->flags & flags) = 0)\n" " \t\t\tcontinue;\n" "diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c\n" "index b171ae8..b062de9 100644\n" @@ -201,8 +200,8 @@ " \tstruct device_node *np;\n" " \n" " \tfor (np = allnodes; np; np = np->allnext)\n" - "-\t\tif (np->node == handle)\n" - "+\t\tif (np->phandle == handle)\n" + "-\t\tif (np->node = handle)\n" + "+\t\tif (np->phandle = handle)\n" " \t\t\tbreak;\n" " \n" " \treturn np;\n" @@ -253,14 +252,14 @@ "@@ -315,12 +315,11 @@ unsigned long __init unflatten_dt_node(unsigned long mem,\n" " \t\t\t\t\t__alignof__(struct property));\n" " \t\tif (allnextpp) {\n" - " \t\t\tif (strcmp(pname, \"linux,phandle\") == 0) {\n" + " \t\t\tif (strcmp(pname, \"linux,phandle\") = 0) {\n" "-\t\t\t\tnp->node = *((u32 *)*p);\n" - "-\t\t\t\tif (np->linux_phandle == 0)\n" + "-\t\t\t\tif (np->linux_phandle = 0)\n" "-\t\t\t\t\tnp->linux_phandle = np->node;\n" - "+\t\t\t\tif (np->phandle == 0)\n" + "+\t\t\t\tif (np->phandle = 0)\n" "+\t\t\t\t\tnp->phandle = *((u32 *)*p);\n" " \t\t\t}\n" - " \t\t\tif (strcmp(pname, \"ibm,phandle\") == 0)\n" + " \t\t\tif (strcmp(pname, \"ibm,phandle\") = 0)\n" "-\t\t\t\tnp->linux_phandle = *((u32 *)*p);\n" "+\t\t\t\tnp->phandle = *((u32 *)*p);\n" " \t\t\tpp->name = pname;\n" @@ -323,8 +322,8 @@ " \t}\n" " \n" " \tdp = pci_device_to_OF_node(pdev);\n" - "-\tif (node == dp->node) {\n" - "+\tif (node == dp->phandle) {\n" + "-\tif (node = dp->node) {\n" + "+\tif (node = dp->phandle) {\n" " \t\tstruct fb_var_screeninfo *var = &default_var;\n" " \t\tunsigned int N, P, Q, M, T, R;\n" " \t\tu32 v_total, h_total;\n" @@ -358,4 +357,4 @@ " \t\t\t\t\"%s doesn't match!\\n\", propname);\n" " \t\t\treturn -ENODEV;" -21b8d1689bc4b7b928861385d83f3473d2f97d366e5f9194ecc0a76636ea260c +15115c79dea40f848097fd67df3daf3cf4a7fcba2a4bec03a55fc507c02d39d6
diff --git a/a/content_digest b/N2/content_digest index a3ba9b7..c50306c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,8 +7,7 @@ microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "In struct device_node, the phandle is named 'linux_phandle' for PowerPC\n" @@ -358,4 +357,4 @@ " \t\t\t\t\"%s doesn't match!\\n\", propname);\n" " \t\t\treturn -ENODEV;" -21b8d1689bc4b7b928861385d83f3473d2f97d366e5f9194ecc0a76636ea260c +99ee81c5db087413a85a1bf9c8166f5c36a1e26032922206236ffde82008b584
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.