diff for duplicates of <1495552190.2344.17.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 398cc8b..59f1963 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,23 +5,23 @@ On Tue, 2017-05-23 at 16:42 +0300, Adriana Reus wrote: > > > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > > --- -> > ?drivers/clk/clk.c | 14 +++++++++++--- -> > ?1 file changed, 11 insertions(+), 3 deletions(-) +> > drivers/clk/clk.c | 14 +++++++++++--- +> > 1 file changed, 11 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > > index 01306191133c..6ee5fc59cf1f 100644 > > --- a/drivers/clk/clk.c > > +++ b/drivers/clk/clk.c > > @@ -491,6 +491,9 @@ 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->flags & CLK_SET_RATE_GATE) +> > + clk_core_rate_unprotect(core); > > ^ function call before declaration (unless i missed something when applying), -> ? gets fixed in following patch, but makes this one not compile standalone. +> gets fixed in following patch, but makes this one not compile standalone. > You didn't miss anything, I did. It is now fixed @@ -30,23 +30,23 @@ You didn't miss anything, I did. It is now fixed > drivers/clk/clk.c: In function 'clk_core_unprepare': > drivers/clk/clk.c:495:3: error: implicit declaration of function > 'clk_core_rate_unprotect' [-Werror=implicit-function-declaration] -> ???clk_core_rate_unprotect(core); +> clk_core_rate_unprotect(core); > > > + -> > ????????if (--core->prepare_count > 0) -> > ????????????????return; +> > if (--core->prepare_count > 0) +> > return; > > > > @@ -561,6 +564,14 @@ 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 -> > +????????*/ -> > +???????if (core->flags & CLK_SET_RATE_GATE) -> > +???????????????clk_core_rate_protect(core); +> > + /* +> > + * 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); > > ^ same here; > Note: maybe have a quick check that each patch compiles individually @@ -56,24 +56,24 @@ I should have. Now it is done and it is OK (with our remarks fixed, of course) Thanks a lot for pointing this out. > > + -> > ????????return 0; -> > ?} +> > return 0; +> > } > > > > @@ -1738,9 +1749,6 @@ static int clk_core_set_rate_nolock(struct clk_core > > *core, -> > ????????if (clk_core_rate_is_protected(core)) -> > ????????????????return -EBUSY; +> > if (clk_core_rate_is_protected(core)) +> > return -EBUSY; > > -> > -???????if ((core->flags & CLK_SET_RATE_GATE) && core->prepare_count) -> > -???????????????return -EBUSY; +> > - if ((core->flags & CLK_SET_RATE_GATE) && core->prepare_count) +> > - return -EBUSY; > > - -> > ????????/* calculate new rates and get the topmost changed clock */ -> > ????????top = clk_calc_new_rates(core, req_rate); -> > ????????if (!top) +> > /* calculate new rates and get the topmost changed clock */ +> > top = clk_calc_new_rates(core, req_rate); +> > if (!top) > > -- > > 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 04f2b72..65ee8ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,17 @@ "ref\020170521215958.19743-1-jbrunet@baylibre.com\0" "ref\020170521215958.19743-11-jbrunet@baylibre.com\0" "ref\0CABjU8GuZQ_2ynUTJpwNoG19zPq-P8Ld=4mwk0EvpHrPROF=bXg@mail.gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v2 10/11] clk: fix CLK_SET_RATE_GATE with clock rate protection\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v2 10/11] clk: fix CLK_SET_RATE_GATE with clock rate protection\0" "Date\0Tue, 23 May 2017 17:09:50 +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 16:42 +0300, Adriana Reus wrote:\n" @@ -14,23 +21,23 @@ "> > \n" "> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>\n" "> > ---\n" - "> > ?drivers/clk/clk.c | 14 +++++++++++---\n" - "> > ?1 file changed, 11 insertions(+), 3 deletions(-)\n" + "> > \302\240drivers/clk/clk.c | 14 +++++++++++---\n" + "> > \302\2401 file changed, 11 insertions(+), 3 deletions(-)\n" "> > \n" "> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> > index 01306191133c..6ee5fc59cf1f 100644\n" "> > --- a/drivers/clk/clk.c\n" "> > +++ b/drivers/clk/clk.c\n" "> > @@ -491,6 +491,9 @@ static void clk_core_unprepare(struct clk_core *core)\n" - "> > ????????if (WARN_ON(core->prepare_count == 1 && core->flags &\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (WARN_ON(core->prepare_count == 1 && core->flags &\n" "> > CLK_IS_CRITICAL))\n" - "> > ????????????????return;\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;\n" "> > \n" - "> > +???????if (core->flags & CLK_SET_RATE_GATE)\n" - "> > +???????????????clk_core_rate_unprotect(core);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (core->flags & CLK_SET_RATE_GATE)\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_rate_unprotect(core);\n" "> \n" "> ^ function call before declaration (unless i missed something when applying),\n" - "> ? gets fixed in following patch, but makes this one not compile standalone.\n" + "> \302\240 gets fixed in following patch, but makes this one not compile standalone.\n" "> \n" "\n" "You didn't miss anything, I did. It is now fixed\n" @@ -39,23 +46,23 @@ "> drivers/clk/clk.c: In function 'clk_core_unprepare':\n" "> drivers/clk/clk.c:495:3: error: implicit declaration of function\n" "> 'clk_core_rate_unprotect' [-Werror=implicit-function-declaration]\n" - "> ???clk_core_rate_unprotect(core);\n" + "> \302\240\302\240\302\240clk_core_rate_unprotect(core);\n" "> \n" "> > +\n" - "> > ????????if (--core->prepare_count > 0)\n" - "> > ????????????????return;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (--core->prepare_count > 0)\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;\n" "> > \n" "> > @@ -561,6 +564,14 @@ static int clk_core_prepare(struct clk_core *core)\n" "> > \n" - "> > ????????core->prepare_count++;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240core->prepare_count++;\n" "> > \n" - "> > +???????/*\n" - "> > +????????* CLK_SET_RATE_GATE is a special case of clock protection\n" - "> > +????????* Instead of a consumer protection, the provider is protecting\n" - "> > +????????* itself when prepared\n" - "> > +????????*/\n" - "> > +???????if (core->flags & CLK_SET_RATE_GATE)\n" - "> > +???????????????clk_core_rate_protect(core);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240/*\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240* CLK_SET_RATE_GATE is a special case of clock protection\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240* Instead of a consumer protection, the provider is protecting\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240* itself when prepared\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240*/\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (core->flags & CLK_SET_RATE_GATE)\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_rate_protect(core);\n" "> \n" "> ^ same here;\n" "> Note: maybe have a quick check that each patch compiles individually\n" @@ -65,26 +72,26 @@ "Thanks a lot for pointing this out.\n" "\n" "> > +\n" - "> > ????????return 0;\n" - "> > ?}\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n" + "> > \302\240}\n" "> > \n" "> > @@ -1738,9 +1749,6 @@ static int clk_core_set_rate_nolock(struct clk_core\n" "> > *core,\n" - "> > ????????if (clk_core_rate_is_protected(core))\n" - "> > ????????????????return -EBUSY;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (clk_core_rate_is_protected(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\240\302\240return -EBUSY;\n" "> > \n" - "> > -???????if ((core->flags & CLK_SET_RATE_GATE) && core->prepare_count)\n" - "> > -???????????????return -EBUSY;\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240if ((core->flags & CLK_SET_RATE_GATE) && core->prepare_count)\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 -EBUSY;\n" "> > -\n" - "> > ????????/* calculate new rates and get the topmost changed clock */\n" - "> > ????????top = clk_calc_new_rates(core, req_rate);\n" - "> > ????????if (!top)\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240/* calculate new rates and get the topmost changed clock */\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240top = clk_calc_new_rates(core, req_rate);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!top)\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" -f9d960a47f22df72bcaf8c8fc970c9de6b22f247e9d5ecad086827f0e31503a7 +4be35894f5a433ee7c45a7241ff376cc2c51063794fc3bc06bb79e8d034597e9
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.