From mboxrd@z Thu Jan 1 00:00:00 1970 From: b29396@freescale.com (Dong Aisheng) Date: Fri, 24 Jul 2015 11:23:07 +0800 Subject: [PATCH v2 1/5] clk: remove duplicated code with __clk_set_parent_after In-Reply-To: <20150724001135.642.54711@quantum> References: <1431610143-21853-1-git-send-email-aisheng.dong@freescale.com> <1431610143-21853-2-git-send-email-aisheng.dong@freescale.com> <20150528040919.22384.79189@quantum> <20150715122522.GA30570@shlinux1.ap.freescale.net> <20150715122955.GB30570@shlinux1.ap.freescale.net> <20150722140809.GC13623@shlinux1.ap.freescale.net> <20150724001135.642.54711@quantum> Message-ID: <20150724032304.GA16916@shlinux1.ap.freescale.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Jul 23, 2015 at 05:11:35PM -0700, Michael Turquette wrote: > Quoting Dong Aisheng (2015-07-22 07:08:10) > > Ping... > > > > On Wed, Jul 15, 2015 at 08:29:56PM +0800, Dong Aisheng wrote: > > > On Wed, Jul 15, 2015 at 08:25:24PM +0800, Dong Aisheng wrote: > > > > Hi Mike, > > > > > > > > On Wed, May 27, 2015 at 09:09:19PM -0700, Michael Turquette wrote: > > > > > 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 > > > > > > Cc: Stephen Boyd > > > > > > Suggested-by: Stephen Boyd > > > > > > Signed-off-by: Dong Aisheng > > > > > > > > > > Patch looks good to me. > > > > > > > > > > Also just noticed that the second argument to __clk_set_parent_after is > > > > > never used :-( > > > > > > > > > > > > > Ping... > > > > > > > > I did not see this patch series in your tree for v4.2 rc. > > > > Is this got missed? > > Dong Aisheng, > > Yes it was missed. My apologies. Can you refresh it and re-send? > Will do it. Thanks Regards Dong Aisheng > Thanks, > Mike > > > > > > > > > > > Updated Mike's email address. > > > > > > Regards > > > Dong Aisheng > > > > > > > Regards > > > > Dong Aisheng > > > > > > > > > Regards, > > > > > 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 = 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 = clk_enable_lock(); > > > > > > - clk_core_disable(core); > > > > > > - clk_core_disable(parent); > > > > > > - clk_enable_unlock(flags); > > > > > > - clk_core_unprepare(parent); > > > > > > - } > > > > > > return ret; > > > > > > } > > > > > > > > > > > > -- > > > > > > 1.9.1 > > > > > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > > the body of a message to majordomo at vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > Please read the FAQ at http://www.tux.org/lkml/