diff for duplicates of <20150829091418.28546.8569.sendpatchset@little-apple> diff --git a/a/1.txt b/N1/1.txt index c055c5b..60081bc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,12 +28,12 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> - /* Skip clocks with no name. */ - ret = of_property_read_string_index(np, "clock-output-names", - i, &name); -- if (ret < 0 || strlen(name) == 0) +- if (ret < 0 || strlen(name) = 0) - continue; - parent_name = of_clk_get_parent_name(np, i); ret = of_property_read_u32_index(np, idxname, i, &clkidx); - if (parent_name == NULL || ret < 0) + if (parent_name = NULL || ret < 0) break; if (clkidx >= MSTP_MAX_CLOCKS) { @@ -45,7 +45,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> } + if (of_property_read_string_index(np, "clock-output-names", -+ i, &name) == 0) { ++ i, &name) = 0) { + allocated_name = false; + } else { + name = kasprintf(GFP_KERNEL, "%s.%u", np->name, clkidx); diff --git a/a/content_digest b/N1/content_digest index 0fb692b..861ce0a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,17 @@ "ref\020150829091323.28546.28287.sendpatchset@little-apple\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH v4 05/05] clk: shmobile: Make MSTP clock-output-names optional\0" - "Date\0Sat, 29 Aug 2015 18:14:18 +0900\0" + "Date\0Sat, 29 Aug 2015 09:14:18 +0000\0" "To\0linux-clk@vger.kernel.org\0" "Cc\0kuninori.morimoto.gx@renesas.com" - linux-sh@vger.kernel.org - mturquette@baylibre.com - gaku.inami.xw@bp.renesas.com - sboyd@codeaurora.org - horms@verge.net.au - geert@linux-m68k.org - laurent.pinchart@ideasonboard.com - "Magnus Damm <magnus.damm@gmail.com>\0" + linux-sh@vger.kernel.org + mturquette@baylibre.com + gaku.inami.xw@bp.renesas.com + sboyd@codeaurora.org + horms@verge.net.au + geert@linux-m68k.org + laurent.pinchart@ideasonboard.com + " Magnus Damm <magnus.damm@gmail.com>\0" "\00:1\0" "b\0" "From: Magnus Damm <damm+renesas@opensource.se>\n" @@ -44,12 +44,12 @@ "-\t\t/* Skip clocks with no name. */\n" "-\t\tret = of_property_read_string_index(np, \"clock-output-names\",\n" "-\t\t\t\t\t\t i, &name);\n" - "-\t\tif (ret < 0 || strlen(name) == 0)\n" + "-\t\tif (ret < 0 || strlen(name) = 0)\n" "-\t\t\tcontinue;\n" "-\n" " \t\tparent_name = of_clk_get_parent_name(np, i);\n" " \t\tret = of_property_read_u32_index(np, idxname, i, &clkidx);\n" - " \t\tif (parent_name == NULL || ret < 0)\n" + " \t\tif (parent_name = NULL || ret < 0)\n" " \t\t\tbreak;\n" " \n" " \t\tif (clkidx >= MSTP_MAX_CLOCKS) {\n" @@ -61,7 +61,7 @@ " \t\t}\n" " \n" "+\t\tif (of_property_read_string_index(np, \"clock-output-names\",\n" - "+\t\t\t\t\t\t i, &name) == 0) {\n" + "+\t\t\t\t\t\t i, &name) = 0) {\n" "+\t\t\tallocated_name = false;\n" "+\t\t} else {\n" "+\t\t\tname = kasprintf(GFP_KERNEL, \"%s.%u\", np->name, clkidx);\n" @@ -93,4 +93,4 @@ " \n" " \tof_clk_add_provider(np, of_clk_src_onecell_get, &group->data);" -152a5064367ad8228d7cd4f8f86fadaecc36a01d471aacf456dbc9411945b6af +50fc95009378126d4f1e63effb3d4613a7928a4b53ae152d79afc610e5badcaa
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.