diff for duplicates of <20091124081957.6216.74456.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index 12962aa..703f96c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ index 96d5ce5..2004b19 100644 - if (func->phandle && target->node != func->phandle) + if (func->phandle && target->linux_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..2196e71 100644 @@ -87,8 +87,8 @@ index d80a65d..2a3e302 100644 struct device_node *np; for (np = allnodes; np; np = np->allnext) -- if (np->node == handle) -+ if (np->linux_phandle == handle) +- if (np->node = handle) ++ if (np->linux_phandle = handle) break; return np; @@ -139,13 +139,13 @@ index 6164781..07ae161 100644 @@ -315,9 +315,8 @@ 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; + np->linux_phandle = *((u32 *)*p); } - if (strcmp(pname, "ibm,phandle") == 0) + if (strcmp(pname, "ibm,phandle") = 0) np->linux_phandle = *((u32 *)*p); diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 75ac19b..a776e65 100644 @@ -204,8 +204,8 @@ index 913b4a4..8357927 100644 } dp = pci_device_to_OF_node(pdev); -- if (node == dp->node) { -+ if (node == dp->linux_phandle) { +- if (node = dp->node) { ++ if (node = dp->linux_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 c99eb44..2152045 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 11/11] of: unify phandle name in struct device_node\0" - "Date\0Tue, 24 Nov 2009 01:20:05 -0700\0" + "Date\0Tue, 24 Nov 2009 08:20:05 +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" @@ -52,7 +51,7 @@ "-\t\tif (func->phandle && target->node != func->phandle)\n" "+\t\tif (func->phandle && target->linux_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..2196e71 100644\n" @@ -101,8 +100,8 @@ " \tstruct device_node *np;\n" " \n" " \tfor (np = allnodes; np; np = np->allnext)\n" - "-\t\tif (np->node == handle)\n" - "+\t\tif (np->linux_phandle == handle)\n" + "-\t\tif (np->node = handle)\n" + "+\t\tif (np->linux_phandle = handle)\n" " \t\t\tbreak;\n" " \n" " \treturn np;\n" @@ -153,13 +152,13 @@ "@@ -315,9 +315,8 @@ 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\t\tnp->linux_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" "diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c\n" "index 75ac19b..a776e65 100644\n" @@ -218,8 +217,8 @@ " \t}\n" " \n" " \tdp = pci_device_to_OF_node(pdev);\n" - "-\tif (node == dp->node) {\n" - "+\tif (node == dp->linux_phandle) {\n" + "-\tif (node = dp->node) {\n" + "+\tif (node = dp->linux_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" @@ -239,4 +238,4 @@ " \n" " \tstruct\tproperty *properties;" -cab536f24e69f4a462f21c6772c0460ac1d2961e9c517d81bf847bfb5c246573 +2868368b9188c14767296eecda539daad2b6eeaf76f37dcd5c2593629b52a336
diff --git a/a/content_digest b/N2/content_digest index c99eb44..5092f11 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,8 +8,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" @@ -239,4 +238,4 @@ " \n" " \tstruct\tproperty *properties;" -cab536f24e69f4a462f21c6772c0460ac1d2961e9c517d81bf847bfb5c246573 +090edc0eabddf22ad523ed080e28fa5c572e8b5947bff7c3d6bc1e8bd1e85ca6
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.