diff for duplicates of <1462907459.9981.0.camel@plaes.org> diff --git a/a/1.txt b/N1/1.txt index d5d8962..45a0f3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,28 +17,28 @@ On Mon, 2016-05-09 at 15:39 -0700, Stephen Boyd wrote: > +++ b/drivers/clk/sunxi/clk-sun4i-display.c > @@ -107,7 +107,7 @@ static int sun4i_a10_display_reset_xlate(struct > reset_controller_dev *rcdev, -> static void __init sun4i_a10_display_init(struct device_node *node, -> const struct +> ?static void __init sun4i_a10_display_init(struct device_node *node, +> ? ??const struct > sun4i_a10_display_clk_data *data) -> { +> ?{ > - const char *parents[data->parents]; > + const char *parents[4]; -> const char *clk_name = node->name; -> struct reset_data *reset_data; -> struct clk_divider *div = NULL; +> ? const char *clk_name = node->name; +> ? struct reset_data *reset_data; +> ? struct clk_divider *div = NULL; > @@ -126,8 +126,8 @@ static void __init sun4i_a10_display_init(struct > device_node *node, -> return; -> } -> +> ? return; +> ? } +> ? > - ret = of_clk_parent_fill(node, parents, data->parents); > - if (ret != data->parents) { > + ret = of_clk_parent_fill(node, parents, > ARRAY_SIZE(parents)); > + if (ret != ARRAY_SIZE(parents)) { -> pr_err("%s: Could not retrieve the parents\n", +> ? pr_err("%s: Could not retrieve the parents\n", > clk_name); -> goto unmap; -> } +> ? goto unmap; +> ? } This change breaks at least de_[bf]e clocks which have 3 clock parents. diff --git a/a/content_digest b/N1/content_digest index 6488d2a..b3faf7a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,27 +4,10 @@ "ref\020160508200308.GF6167@lukather\0" "ref\020160509223238.GW3492@codeaurora.org\0" "ref\020160509223924.GX3492@codeaurora.org\0" - "From\0Priit Laes <plaes@plaes.org>\0" - "Subject\0Re: [linux-sunxi] Re: [PATCH v4 01/11] clk: sunxi: Add display and TCON0 clocks driver\0" + "From\0plaes@plaes.org (Priit Laes)\0" + "Subject\0[linux-sunxi] Re: [PATCH v4 01/11] clk: sunxi: Add display and TCON0 clocks driver\0" "Date\0Tue, 10 May 2016 22:10:59 +0300\0" - "To\0sboyd@codeaurora.org" - " Maxime Ripard <maxime.ripard@free-electrons.com>\0" - "Cc\0Mike Turquette <mturquette@baylibre.com>" - David Airlie <airlied@linux.ie> - Chen-Yu Tsai <wens@csie.org> - Rob Herring <robh+dt@kernel.org> - Daniel Vetter <daniel@ffwll.ch> - Hans de Goede <hdegoede@redhat.com> - devicetree@vger.kernel.org - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - linux-sunxi@googlegroups.com - dri-devel@lists.freedesktop.org - Boris Brezillon <boris.brezillon@free-electrons.com> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - Alexander Kaplan <alex@nextthing.co> - " Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2016-05-09 at 15:39 -0700, Stephen Boyd wrote:\n" @@ -46,30 +29,30 @@ "> +++ b/drivers/clk/sunxi/clk-sun4i-display.c\n" "> @@ -107,7 +107,7 @@ static int sun4i_a10_display_reset_xlate(struct\n" "> reset_controller_dev *rcdev,\n" - "> \302\240static void __init sun4i_a10_display_init(struct device_node *node,\n" - "> \302\240\t\t\t\t\t\302\240\302\240const struct\n" + "> ?static void __init sun4i_a10_display_init(struct device_node *node,\n" + "> ?\t\t\t\t\t??const struct\n" "> sun4i_a10_display_clk_data *data)\n" - "> \302\240{\n" + "> ?{\n" "> -\tconst char *parents[data->parents];\n" "> +\tconst char *parents[4];\n" - "> \302\240\tconst char *clk_name = node->name;\n" - "> \302\240\tstruct reset_data *reset_data;\n" - "> \302\240\tstruct clk_divider *div = NULL;\n" + "> ?\tconst char *clk_name = node->name;\n" + "> ?\tstruct reset_data *reset_data;\n" + "> ?\tstruct clk_divider *div = NULL;\n" "> @@ -126,8 +126,8 @@ static void __init sun4i_a10_display_init(struct\n" "> device_node *node,\n" - "> \302\240\t\treturn;\n" - "> \302\240\t}\n" - "> \302\240\n" + "> ?\t\treturn;\n" + "> ?\t}\n" + "> ?\n" "> -\tret = of_clk_parent_fill(node, parents, data->parents);\n" "> -\tif (ret != data->parents) {\n" "> +\tret = of_clk_parent_fill(node, parents,\n" "> ARRAY_SIZE(parents));\n" "> +\tif (ret != ARRAY_SIZE(parents)) {\n" - "> \302\240\t\tpr_err(\"%s: Could not retrieve the parents\\n\",\n" + "> ?\t\tpr_err(\"%s: Could not retrieve the parents\\n\",\n" "> clk_name);\n" - "> \302\240\t\tgoto unmap;\n" - "> \302\240\t}\n" + "> ?\t\tgoto unmap;\n" + "> ?\t}\n" "\n" This change breaks at least de_[bf]e clocks which have 3 clock parents. -36df60107206e0a2797fd37f11c88768ebf8580d25596bfa6cc7148ada263887 +bd06df2c9b69b3b026131a77e66e23fad9f2e0bb9629524754ae299d9e91144f
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.