diff for duplicates of <1495532928.2344.14.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index bb43fe4..02af47b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,8 +8,8 @@ On Tue, 2017-05-23 at 12:35 +0300, Adriana Reus wrote: > > > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > > --- -> > ?drivers/clk/clk.c | 31 +++++++++++++++++++------------ -> > ?1 file changed, 19 insertions(+), 12 deletions(-) +> > drivers/clk/clk.c | 31 +++++++++++++++++++------------ +> > 1 file changed, 19 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > > index f5c371532509..6031fada37f9 100644 @@ -17,19 +17,19 @@ On Tue, 2017-05-23 at 12:35 +0300, Adriana Reus wrote: > > +++ b/drivers/clk/clk.c > > @@ -1873,6 +1873,23 @@ int clk_set_parent(struct clk *clk, struct clk > > *parent) -> > ?} -> > ?EXPORT_SYMBOL_GPL(clk_set_parent); +> > } +> > EXPORT_SYMBOL_GPL(clk_set_parent); > > > > +static int clk_core_set_phase_nolock(struct clk_core *core, int degrees) > > +{ -> > +???????int ret = -EINVAL; +> > + int ret = -EINVAL; > > + -> > +???????if (!core) -> > +???????????????return 0; +> > + if (!core) +> > + return 0; > > + -> > +???????trace_clk_set_phase(clk->core, degrees); +> > + trace_clk_set_phase(clk->core, degrees); > -> ?^ trace_clk_set_phase(core, degrees) +> ^ trace_clk_set_phase(core, degrees) Shame ... Once again this is a poor use of 'git add --patch'. This particular diff ended up in patch 5. @@ -37,49 +37,49 @@ This particular diff ended up in patch 5. Thanks a lot for catching it! > > + -> > +???????if (core->ops->set_phase) -> > +???????????????ret = core->ops->set_phase(core->hw, degrees); +> > + if (core->ops->set_phase) +> > + ret = core->ops->set_phase(core->hw, degrees); > > + -> > +???????trace_clk_set_phase_complete(core, degrees); +> > + trace_clk_set_phase_complete(core, degrees); > > + -> > +???????return ret; +> > + return ret; > > +} > > + -> > ?/** -> > ? * clk_set_phase - adjust the phase shift of a clock signal -> > ? * @clk: clock signal source +> > /** +> > * clk_set_phase - adjust the phase shift of a clock signal +> > * @clk: clock signal source > > @@ -1895,7 +1912,7 @@ EXPORT_SYMBOL_GPL(clk_set_parent); -> > ? */ -> > ?int clk_set_phase(struct clk *clk, int degrees) -> > ?{ -> > -???????int ret = -EINVAL; -> > +???????int ret; +> > */ +> > int clk_set_phase(struct clk *clk, int degrees) +> > { +> > - int ret = -EINVAL; +> > + int ret; > > -> > ????????if (!clk) -> > ????????????????return 0; +> > if (!clk) +> > return 0; > > @@ -1906,17 +1923,7 @@ int clk_set_phase(struct clk *clk, int degrees) -> > ????????????????degrees += 360; +> > degrees += 360; > > -> > ????????clk_prepare_lock(); +> > clk_prepare_lock(); > > - -> > -???????trace_clk_set_phase(clk->core, degrees); +> > - trace_clk_set_phase(clk->core, degrees); > > - -> > -???????if (clk->core->ops->set_phase) -> > -???????????????ret = clk->core->ops->set_phase(clk->core->hw, degrees); +> > - if (clk->core->ops->set_phase) +> > - ret = clk->core->ops->set_phase(clk->core->hw, degrees); > > - -> > -???????trace_clk_set_phase_complete(clk->core, degrees); +> > - trace_clk_set_phase_complete(clk->core, degrees); > > - -> > -???????if (!ret) -> > -???????????????clk->core->phase = degrees; +> > - if (!ret) +> > - clk->core->phase = degrees; > > - -> > +???????ret = clk_core_set_phase_nolock(clk->core, degrees); -> > ????????clk_prepare_unlock(); +> > + ret = clk_core_set_phase_nolock(clk->core, degrees); +> > clk_prepare_unlock(); > > -> > ????????return ret; +> > return ret; > > -- > > 2.9.4 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-clk" in -> > the body of a message to majordomo at vger.kernel.org -> > More majordomo info at??http://vger.kernel.org/majordomo-info.html +> > the body of a message to majordomo@vger.kernel.org +> > More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index cf5820c..c2699be 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,17 @@ "ref\020170521215958.19743-1-jbrunet@baylibre.com\0" "ref\020170521215958.19743-3-jbrunet@baylibre.com\0" "ref\0CABjU8Gu_0xgto6UfaOofW1RjZkEQtbreqqBS2Ukd+Q0DLSZG8w@mail.gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v2 02/11] clk: add clk_core_set_phase_nolock function\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v2 02/11] clk: add clk_core_set_phase_nolock function\0" "Date\0Tue, 23 May 2017 11:48:48 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Adriana Reus <adi.reus@gmail.com>\0" + "Cc\0Michael Turquette <mturquette@baylibre.com>" + Stephen Boyd <sboyd@codeaurora.org> + Kevin Hilman <khilman@baylibre.com> + linux-clk@vger.kernel.org + linux-amlogic@lists.infradead.org + Linus Walleij <linus.walleij@linaro.org> + " Boris Brezillon <boris.brezillon@free-electrons.com>\0" "\00:1\0" "b\0" "On Tue, 2017-05-23 at 12:35 +0300, Adriana Reus wrote:\n" @@ -17,8 +24,8 @@ "> > \n" "> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>\n" "> > ---\n" - "> > ?drivers/clk/clk.c | 31 +++++++++++++++++++------------\n" - "> > ?1 file changed, 19 insertions(+), 12 deletions(-)\n" + "> > \302\240drivers/clk/clk.c | 31 +++++++++++++++++++------------\n" + "> > \302\2401 file changed, 19 insertions(+), 12 deletions(-)\n" "> > \n" "> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> > index f5c371532509..6031fada37f9 100644\n" @@ -26,19 +33,19 @@ "> > +++ b/drivers/clk/clk.c\n" "> > @@ -1873,6 +1873,23 @@ int clk_set_parent(struct clk *clk, struct clk\n" "> > *parent)\n" - "> > ?}\n" - "> > ?EXPORT_SYMBOL_GPL(clk_set_parent);\n" + "> > \302\240}\n" + "> > \302\240EXPORT_SYMBOL_GPL(clk_set_parent);\n" "> > \n" "> > +static int clk_core_set_phase_nolock(struct clk_core *core, int degrees)\n" "> > +{\n" - "> > +???????int ret = -EINVAL;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240int ret = -EINVAL;\n" "> > +\n" - "> > +???????if (!core)\n" - "> > +???????????????return 0;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!core)\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n" "> > +\n" - "> > +???????trace_clk_set_phase(clk->core, degrees);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240trace_clk_set_phase(clk->core, degrees);\n" "> \n" - "> ?^ trace_clk_set_phase(core, degrees)\n" + "> \302\240^ trace_clk_set_phase(core, degrees)\n" "\n" "Shame ... Once again this is a poor use of 'git add --patch'.\n" "This particular diff ended up in patch 5.\n" @@ -46,51 +53,51 @@ "Thanks a lot for catching it!\n" "\n" "> > +\n" - "> > +???????if (core->ops->set_phase)\n" - "> > +???????????????ret = core->ops->set_phase(core->hw, degrees);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (core->ops->set_phase)\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ret = core->ops->set_phase(core->hw, degrees);\n" "> > +\n" - "> > +???????trace_clk_set_phase_complete(core, degrees);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240trace_clk_set_phase_complete(core, degrees);\n" "> > +\n" - "> > +???????return ret;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240return ret;\n" "> > +}\n" "> > +\n" - "> > ?/**\n" - "> > ? * clk_set_phase - adjust the phase shift of a clock signal\n" - "> > ? * @clk: clock signal source\n" + "> > \302\240/**\n" + "> > \302\240 * clk_set_phase - adjust the phase shift of a clock signal\n" + "> > \302\240 * @clk: clock signal source\n" "> > @@ -1895,7 +1912,7 @@ EXPORT_SYMBOL_GPL(clk_set_parent);\n" - "> > ? */\n" - "> > ?int clk_set_phase(struct clk *clk, int degrees)\n" - "> > ?{\n" - "> > -???????int ret = -EINVAL;\n" - "> > +???????int ret;\n" + "> > \302\240 */\n" + "> > \302\240int clk_set_phase(struct clk *clk, int degrees)\n" + "> > \302\240{\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240int ret = -EINVAL;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240int ret;\n" "> > \n" - "> > ????????if (!clk)\n" - "> > ????????????????return 0;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!clk)\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n" "> > @@ -1906,17 +1923,7 @@ int clk_set_phase(struct clk *clk, int degrees)\n" - "> > ????????????????degrees += 360;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240degrees += 360;\n" "> > \n" - "> > ????????clk_prepare_lock();\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240clk_prepare_lock();\n" "> > -\n" - "> > -???????trace_clk_set_phase(clk->core, degrees);\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240trace_clk_set_phase(clk->core, degrees);\n" "> > -\n" - "> > -???????if (clk->core->ops->set_phase)\n" - "> > -???????????????ret = clk->core->ops->set_phase(clk->core->hw, degrees);\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (clk->core->ops->set_phase)\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ret = clk->core->ops->set_phase(clk->core->hw, degrees);\n" "> > -\n" - "> > -???????trace_clk_set_phase_complete(clk->core, degrees);\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240trace_clk_set_phase_complete(clk->core, degrees);\n" "> > -\n" - "> > -???????if (!ret)\n" - "> > -???????????????clk->core->phase = degrees;\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!ret)\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240clk->core->phase = degrees;\n" "> > -\n" - "> > +???????ret = clk_core_set_phase_nolock(clk->core, degrees);\n" - "> > ????????clk_prepare_unlock();\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240ret = clk_core_set_phase_nolock(clk->core, degrees);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240clk_prepare_unlock();\n" "> > \n" - "> > ????????return ret;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return ret;\n" "> > --\n" "> > 2.9.4\n" "> > \n" "> > --\n" "> > To unsubscribe from this list: send the line \"unsubscribe linux-clk\" in\n" - "> > the body of a message to majordomo at vger.kernel.org\n" - > > More majordomo info at??http://vger.kernel.org/majordomo-info.html + "> > the body of a message to majordomo@vger.kernel.org\n" + "> > More majordomo info at\302\240\302\240http://vger.kernel.org/majordomo-info.html" -70c96c503bb57658d6beafb448dbcbfac53d8bb78de9481a38392178650d63c2 +f0824413449e4c9ad6fcc33632363cfb0469edf7183760684b76133b32e5f8fd
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.