diff for duplicates of <1496049452.7514.5.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index b5347af..84e08e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,63 +13,63 @@ This was disaster waiting to happen ... :( > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- -> ?drivers/clk/clk.c | 23 ++++++++++++----------- -> ?1 file changed, 12 insertions(+), 11 deletions(-) +> drivers/clk/clk.c | 23 ++++++++++++----------- +> 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 6ee5fc59cf1f..e6e5048ce186 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c > @@ -491,9 +491,6 @@ static void clk_core_unprepare(struct clk_core *core) -> ? if (WARN_ON(core->prepare_count == 1 && core->flags & +> if (WARN_ON(core->prepare_count == 1 && core->flags & > CLK_IS_CRITICAL)) -> ? return; -> ? +> return; +> > - if (core->flags & CLK_SET_RATE_GATE) > - clk_core_rate_unprotect(core); > - -> ? if (--core->prepare_count > 0) -> ? return; -> ? +> if (--core->prepare_count > 0) +> return; +> > @@ -564,14 +561,6 @@ static int clk_core_prepare(struct clk_core *core) -> ? -> ? core->prepare_count++; -> ? +> +> core->prepare_count++; +> > - /* -> - ?* CLK_SET_RATE_GATE is a special case of clock protection -> - ?* Instead of a consumer protection, the provider is protecting -> - ?* itself when prepared -> - ?*/ +> - * CLK_SET_RATE_GATE is a special case of clock protection +> - * Instead of a consumer protection, the provider is protecting +> - * itself when prepared +> - */ > - if (core->flags & CLK_SET_RATE_GATE) > - clk_core_rate_protect(core); > - -> ? return 0; -> ?} -> ? +> return 0; +> } +> > @@ -716,6 +705,9 @@ static void clk_core_disable(struct clk_core *core) -> ? if (WARN_ON(core->enable_count == 1 && core->flags & +> if (WARN_ON(core->enable_count == 1 && core->flags & > CLK_IS_CRITICAL)) -> ? return; -> ? +> return; +> > + if (core->flags & CLK_SET_RATE_GATE) > + clk_core_rate_unprotect(core); > + -> ? if (--core->enable_count > 0) -> ? return; -> ? +> if (--core->enable_count > 0) +> return; +> > @@ -791,6 +783,15 @@ static int clk_core_enable(struct clk_core *core) -> ? } -> ? -> ? core->enable_count++; +> } +> +> core->enable_count++; > + > + /* -> + ?* CLK_SET_RATE_GATE is a special case of clock protection -> + ?* Instead of a consumer protection, the provider is protecting -> + ?* itself when enabled -> + ?*/ +> + * CLK_SET_RATE_GATE is a special case of clock protection +> + * Instead of a consumer protection, the provider is protecting +> + * itself when enabled +> + */ > + if (core->flags & CLK_SET_RATE_GATE) > + clk_core_rate_protect(core); > + -> ? return 0; -> ?} -> ? +> return 0; +> } +> diff --git a/a/content_digest b/N1/content_digest index 45e90df..5c3a0fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\020170521215958.19743-1-jbrunet@baylibre.com\0" "ref\020170521215958.19743-12-jbrunet@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v2 11/11] clk: move CLK_SET_RATE_GATE protection from prepare to enable\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v2 11/11] clk: move CLK_SET_RATE_GATE protection from prepare to enable\0" "Date\0Mon, 29 May 2017 11:17:32 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Michael Turquette <mturquette@baylibre.com>" + Stephen Boyd <sboyd@codeaurora.org> + " Kevin Hilman <khilman@baylibre.com>\0" + "Cc\0linux-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 Sun, 2017-05-21 at 23:59 +0200, Jerome Brunet wrote:\n" @@ -21,65 +27,65 @@ "\n" "> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>\n" "> ---\n" - "> ?drivers/clk/clk.c | 23 ++++++++++++-----------\n" - "> ?1 file changed, 12 insertions(+), 11 deletions(-)\n" + "> \302\240drivers/clk/clk.c | 23 ++++++++++++-----------\n" + "> \302\2401 file changed, 12 insertions(+), 11 deletions(-)\n" "> \n" "> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> index 6ee5fc59cf1f..e6e5048ce186 100644\n" "> --- a/drivers/clk/clk.c\n" "> +++ b/drivers/clk/clk.c\n" "> @@ -491,9 +491,6 @@ static void clk_core_unprepare(struct clk_core *core)\n" - "> ?\tif (WARN_ON(core->prepare_count == 1 && core->flags &\n" + "> \302\240\tif (WARN_ON(core->prepare_count == 1 && core->flags &\n" "> CLK_IS_CRITICAL))\n" - "> ?\t\treturn;\n" - "> ?\n" + "> \302\240\t\treturn;\n" + "> \302\240\n" "> -\tif (core->flags & CLK_SET_RATE_GATE)\n" "> -\t\tclk_core_rate_unprotect(core);\n" "> -\n" - "> ?\tif (--core->prepare_count > 0)\n" - "> ?\t\treturn;\n" - "> ?\n" + "> \302\240\tif (--core->prepare_count > 0)\n" + "> \302\240\t\treturn;\n" + "> \302\240\n" "> @@ -564,14 +561,6 @@ static int clk_core_prepare(struct clk_core *core)\n" - "> ?\n" - "> ?\tcore->prepare_count++;\n" - "> ?\n" + "> \302\240\n" + "> \302\240\tcore->prepare_count++;\n" + "> \302\240\n" "> -\t/*\n" - "> -\t?* CLK_SET_RATE_GATE is a special case of clock protection\n" - "> -\t?* Instead of a consumer protection, the provider is protecting\n" - "> -\t?* itself when prepared\n" - "> -\t?*/\n" + "> -\t\302\240* CLK_SET_RATE_GATE is a special case of clock protection\n" + "> -\t\302\240* Instead of a consumer protection, the provider is protecting\n" + "> -\t\302\240* itself when prepared\n" + "> -\t\302\240*/\n" "> -\tif (core->flags & CLK_SET_RATE_GATE)\n" "> -\t\tclk_core_rate_protect(core);\n" "> -\n" - "> ?\treturn 0;\n" - "> ?}\n" - "> ?\n" + "> \302\240\treturn 0;\n" + "> \302\240}\n" + "> \302\240\n" "> @@ -716,6 +705,9 @@ static void clk_core_disable(struct clk_core *core)\n" - "> ?\tif (WARN_ON(core->enable_count == 1 && core->flags &\n" + "> \302\240\tif (WARN_ON(core->enable_count == 1 && core->flags &\n" "> CLK_IS_CRITICAL))\n" - "> ?\t\treturn;\n" - "> ?\n" + "> \302\240\t\treturn;\n" + "> \302\240\n" "> +\tif (core->flags & CLK_SET_RATE_GATE)\n" "> +\t\tclk_core_rate_unprotect(core);\n" "> +\n" - "> ?\tif (--core->enable_count > 0)\n" - "> ?\t\treturn;\n" - "> ?\n" + "> \302\240\tif (--core->enable_count > 0)\n" + "> \302\240\t\treturn;\n" + "> \302\240\n" "> @@ -791,6 +783,15 @@ static int clk_core_enable(struct clk_core *core)\n" - "> ?\t}\n" - "> ?\n" - "> ?\tcore->enable_count++;\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\tcore->enable_count++;\n" "> +\n" "> +\t/*\n" - "> +\t?* CLK_SET_RATE_GATE is a special case of clock protection\n" - "> +\t?* Instead of a consumer protection, the provider is protecting\n" - "> +\t?* itself when enabled\n" - "> +\t?*/\n" + "> +\t\302\240* CLK_SET_RATE_GATE is a special case of clock protection\n" + "> +\t\302\240* Instead of a consumer protection, the provider is protecting\n" + "> +\t\302\240* itself when enabled\n" + "> +\t\302\240*/\n" "> +\tif (core->flags & CLK_SET_RATE_GATE)\n" "> +\t\tclk_core_rate_protect(core);\n" "> +\n" - "> ?\treturn 0;\n" - "> ?}\n" - > ? + "> \302\240\treturn 0;\n" + "> \302\240}\n" + > -1cf7b3ed0e3449a05ea157322efe00a97e7e625d940043d3db402441da5e0c5c +169c4736da9516411d8992eb0f376dd091abfed9a1b7c38bda9be58312ff4448
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.