diff for duplicates of <20150528040919.22384.79189@quantum> diff --git a/a/1.txt b/N1/1.txt index 5e1937b..c7fb605 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,8 +2,7 @@ Quoting Dong Aisheng (2015-05-14 06:28:59) > __clk_set_parent_after() actually used the second argument then we > could put this duplicate logic in there and call it with a different > order of arguments in the success vs. error paths in this function. -> = - +> > Cc: Mike Turquette <mturquette@linaro.org> > Cc: Stephen Boyd <sboyd@codeaurora.org> > Suggested-by: Stephen Boyd <sboyd@codeaurora.org> @@ -20,22 +19,19 @@ Mike > --- > drivers/clk/clk.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) -> = - +> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 659f2b0..0e813ea 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c -> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core,= - struct clk_core *parent, -> flags =3D clk_enable_lock(); +> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core, struct clk_core *parent, +> flags = clk_enable_lock(); > clk_reparent(core, old_parent); > clk_enable_unlock(flags); > + __clk_set_parent_after(core, old_parent, parent); -> = - +> > - if (core->prepare_count) { -> - flags =3D clk_enable_lock(); +> - flags = clk_enable_lock(); > - clk_core_disable(core); > - clk_core_disable(parent); > - clk_enable_unlock(flags); @@ -43,9 +39,7 @@ Mike > - } > return ret; > } -> = - -> -- = - +> +> -- > 1.9.1 ->=20 +> diff --git a/a/content_digest b/N1/content_digest index 02506ff..ca340cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,16 @@ "ref\01431610143-21853-1-git-send-email-aisheng.dong@freescale.com\0" "ref\01431610143-21853-2-git-send-email-aisheng.dong@freescale.com\0" - "From\0Michael Turquette <mturquette@linaro.org>\0" - "Subject\0Re: [PATCH v2 1/5] clk: remove duplicated code with __clk_set_parent_after\0" + "From\0mturquette@linaro.org (Michael Turquette)\0" + "Subject\0[PATCH v2 1/5] clk: remove duplicated code with __clk_set_parent_after\0" "Date\0Wed, 27 May 2015 21:09:19 -0700\0" - "To\0Dong Aisheng <aisheng.dong@freescale.com>" - " linux-clk@vger.kernel.org\0" - "Cc\0linux-kernel@vger.kernel.org" - sboyd@codeaurora.org - shawn.guo@linaro.org - b29396@freescale.com - linux-arm-kernel@lists.infradead.org - Ranjani.Vaidyanathan@freescale.com - b20596@freescale.com - r64343@freescale.com - " b20788@freescale.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Quoting Dong Aisheng (2015-05-14 06:28:59)\n" "> __clk_set_parent_after() actually used the second argument then we\n" "> could put this duplicate logic in there and call it with a different\n" "> order of arguments in the success vs. error paths in this function.\n" - "> =\n" - "\n" + "> \n" "> Cc: Mike Turquette <mturquette@linaro.org>\n" "> Cc: Stephen Boyd <sboyd@codeaurora.org>\n" "> Suggested-by: Stephen Boyd <sboyd@codeaurora.org>\n" @@ -38,22 +27,19 @@ "> ---\n" "> drivers/clk/clk.c | 8 +-------\n" "> 1 file changed, 1 insertion(+), 7 deletions(-)\n" - "> =\n" - "\n" + "> \n" "> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> index 659f2b0..0e813ea 100644\n" "> --- a/drivers/clk/clk.c\n" "> +++ b/drivers/clk/clk.c\n" - "> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core,=\n" - " struct clk_core *parent,\n" - "> flags =3D clk_enable_lock();\n" + "> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core, struct clk_core *parent,\n" + "> flags = clk_enable_lock();\n" "> clk_reparent(core, old_parent);\n" "> clk_enable_unlock(flags);\n" "> + __clk_set_parent_after(core, old_parent, parent);\n" - "> =\n" - "\n" + "> \n" "> - if (core->prepare_count) {\n" - "> - flags =3D clk_enable_lock();\n" + "> - flags = clk_enable_lock();\n" "> - clk_core_disable(core);\n" "> - clk_core_disable(parent);\n" "> - clk_enable_unlock(flags);\n" @@ -61,11 +47,9 @@ "> - }\n" "> return ret;\n" "> }\n" - "> =\n" - "\n" - "> -- =\n" - "\n" + "> \n" + "> -- \n" "> 1.9.1\n" - >=20 + > -3b95da1e46d619e0c5590a41f3036e38cfa99f6932b64b5fb9050ed988d76ba5 +1eb04c374ed94429d104806cce36812192d53a960262725cf8e2c0612853aa50
diff --git a/a/1.txt b/N2/1.txt index 5e1937b..c7fb605 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,8 +2,7 @@ Quoting Dong Aisheng (2015-05-14 06:28:59) > __clk_set_parent_after() actually used the second argument then we > could put this duplicate logic in there and call it with a different > order of arguments in the success vs. error paths in this function. -> = - +> > Cc: Mike Turquette <mturquette@linaro.org> > Cc: Stephen Boyd <sboyd@codeaurora.org> > Suggested-by: Stephen Boyd <sboyd@codeaurora.org> @@ -20,22 +19,19 @@ Mike > --- > drivers/clk/clk.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) -> = - +> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 659f2b0..0e813ea 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c -> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core,= - struct clk_core *parent, -> flags =3D clk_enable_lock(); +> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core, struct clk_core *parent, +> flags = clk_enable_lock(); > clk_reparent(core, old_parent); > clk_enable_unlock(flags); > + __clk_set_parent_after(core, old_parent, parent); -> = - +> > - if (core->prepare_count) { -> - flags =3D clk_enable_lock(); +> - flags = clk_enable_lock(); > - clk_core_disable(core); > - clk_core_disable(parent); > - clk_enable_unlock(flags); @@ -43,9 +39,7 @@ Mike > - } > return ret; > } -> = - -> -- = - +> +> -- > 1.9.1 ->=20 +> diff --git a/a/content_digest b/N2/content_digest index 02506ff..814e531 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -20,8 +20,7 @@ "> __clk_set_parent_after() actually used the second argument then we\n" "> could put this duplicate logic in there and call it with a different\n" "> order of arguments in the success vs. error paths in this function.\n" - "> =\n" - "\n" + "> \n" "> Cc: Mike Turquette <mturquette@linaro.org>\n" "> Cc: Stephen Boyd <sboyd@codeaurora.org>\n" "> Suggested-by: Stephen Boyd <sboyd@codeaurora.org>\n" @@ -38,22 +37,19 @@ "> ---\n" "> drivers/clk/clk.c | 8 +-------\n" "> 1 file changed, 1 insertion(+), 7 deletions(-)\n" - "> =\n" - "\n" + "> \n" "> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c\n" "> index 659f2b0..0e813ea 100644\n" "> --- a/drivers/clk/clk.c\n" "> +++ b/drivers/clk/clk.c\n" - "> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core,=\n" - " struct clk_core *parent,\n" - "> flags =3D clk_enable_lock();\n" + "> @@ -1159,14 +1159,8 @@ static int __clk_set_parent(struct clk_core *core, struct clk_core *parent,\n" + "> flags = clk_enable_lock();\n" "> clk_reparent(core, old_parent);\n" "> clk_enable_unlock(flags);\n" "> + __clk_set_parent_after(core, old_parent, parent);\n" - "> =\n" - "\n" + "> \n" "> - if (core->prepare_count) {\n" - "> - flags =3D clk_enable_lock();\n" + "> - flags = clk_enable_lock();\n" "> - clk_core_disable(core);\n" "> - clk_core_disable(parent);\n" "> - clk_enable_unlock(flags);\n" @@ -61,11 +57,9 @@ "> - }\n" "> return ret;\n" "> }\n" - "> =\n" - "\n" - "> -- =\n" - "\n" + "> \n" + "> -- \n" "> 1.9.1\n" - >=20 + > -3b95da1e46d619e0c5590a41f3036e38cfa99f6932b64b5fb9050ed988d76ba5 +2d2cc8243b95b2107184d05d924f1750302cca2ae51c42f4c52755208c759f68
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.