diff for duplicates of <20180828015252.28511-7-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 7653ac0..b687c2b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -110,7 +110,7 @@ index b51cbb9e87dc..c876a8e62848 100644 @@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp) tmp_buf[0] = '\0'; __build_path_component(dp, tmp_buf); - if (tmp_buf[0] = '\0') + if (tmp_buf[0] == '\0') - strcpy(tmp_buf, dp->name); + snprint(tmp_buf, sizeof(tmp_buf), "%pOFn", dp); @@ -132,7 +132,7 @@ index baeaeed64993..6220411ce8fc 100644 (unsigned int) (regs->phys_addr & 0xffffffffUL)); return; @@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf) - const char *prefix = (type = 0) ? "m" : "i"; + const char *prefix = (type == 0) ? "m" : "i"; if (low_bits) - sprintf(tmp_buf, "%s@%s%x,%x", @@ -147,7 +147,7 @@ index baeaeed64993..6220411ce8fc 100644 + dp, prefix, high_bits); - } else if (type = 12) { + } else if (type == 12) { - sprintf(tmp_buf, "%s@%x", - dp->name, high_bits); + sprintf(tmp_buf, "%pOFn@%x", @@ -251,7 +251,7 @@ index baeaeed64993..6220411ce8fc 100644 @@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf) regs = prop->value; - if (prop->length = sizeof(u32) || regs[1] = 1) { + if (prop->length == sizeof(u32) || regs[1] == 1) { - sprintf(tmp_buf, "%s@%x", - dp->name, regs[0]); + sprintf(tmp_buf, "%pOFn@%x", @@ -283,7 +283,7 @@ index baeaeed64993..6220411ce8fc 100644 @@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp) tmp_buf[0] = '\0'; __build_path_component(dp, tmp_buf); - if (tmp_buf[0] = '\0') + if (tmp_buf[0] == '\0') - strcpy(tmp_buf, dp->name); + snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp); diff --git a/a/content_digest b/N1/content_digest index 97bceb2..6a8ce1a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020180828015252.28511-1-robh@kernel.org\0" "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] sparc: Convert to using %pOFn instead of device_node.name\0" - "Date\0Tue, 28 Aug 2018 01:52:08 +0000\0" + "Date\0Mon, 27 Aug 2018 20:52:08 -0500\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" " sparclinux@vger.kernel.org\0" @@ -119,7 +119,7 @@ "@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp)\n" " \ttmp_buf[0] = '\\0';\n" " \t__build_path_component(dp, tmp_buf);\n" - " \tif (tmp_buf[0] = '\\0')\n" + " \tif (tmp_buf[0] == '\\0')\n" "-\t\tstrcpy(tmp_buf, dp->name);\n" "+\t\tsnprint(tmp_buf, sizeof(tmp_buf), \"%pOFn\", dp);\n" " \n" @@ -141,7 +141,7 @@ " \t\t\t(unsigned int) (regs->phys_addr & 0xffffffffUL));\n" " \t\treturn;\n" "@@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)\n" - " \t\tconst char *prefix = (type = 0) ? \"m\" : \"i\";\n" + " \t\tconst char *prefix = (type == 0) ? \"m\" : \"i\";\n" " \n" " \t\tif (low_bits)\n" "-\t\t\tsprintf(tmp_buf, \"%s@%s%x,%x\",\n" @@ -156,7 +156,7 @@ "+\t\t\t\tdp,\n" " \t\t\t\tprefix,\n" " \t\t\t\thigh_bits);\n" - " \t} else if (type = 12) {\n" + " \t} else if (type == 12) {\n" "-\t\tsprintf(tmp_buf, \"%s@%x\",\n" "-\t\t\tdp->name, high_bits);\n" "+\t\tsprintf(tmp_buf, \"%pOFn@%x\",\n" @@ -260,7 +260,7 @@ "@@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf)\n" " \tregs = prop->value;\n" " \n" - " \tif (prop->length = sizeof(u32) || regs[1] = 1) {\n" + " \tif (prop->length == sizeof(u32) || regs[1] == 1) {\n" "-\t\tsprintf(tmp_buf, \"%s@%x\",\n" "-\t\t\tdp->name, regs[0]);\n" "+\t\tsprintf(tmp_buf, \"%pOFn@%x\",\n" @@ -292,7 +292,7 @@ "@@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp)\n" " \ttmp_buf[0] = '\\0';\n" " \t__build_path_component(dp, tmp_buf);\n" - " \tif (tmp_buf[0] = '\\0')\n" + " \tif (tmp_buf[0] == '\\0')\n" "-\t\tstrcpy(tmp_buf, dp->name);\n" "+\t\tsnprintf(tmp_buf, sizeof(tmp_buf), \"%pOFn\", dp);\n" " \n" @@ -301,4 +301,4 @@ "-- \n" 2.17.1 -46e5b6df971f70caf36004e87a6df29f520ae4480ddb2e6e11d6cfdcd45562bd +b37c82bfb9c79bd807a999a35619197fbd9d265dada1decb39363517e5edba87
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.