| Message ID | 1350640038-26358-1-git-send-email-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19 October 2012 11:47, Linus Walleij <linus.walleij@linaro.org> wrote: > A minor code refactoring saving a few lines by merging prepare() > and enable() calls. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > arch/arm/kernel/smp_twd.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c > index b22d700..b92d524 100644 > --- a/arch/arm/kernel/smp_twd.c > +++ b/arch/arm/kernel/smp_twd.c > @@ -248,17 +248,9 @@ static struct clk *twd_get_clock(void) > return clk; > } > > - err = clk_prepare(clk); > + err = clk_prepare_enable(clk); > if (err) { > - pr_err("smp_twd: clock failed to prepare: %d\n", err); > - clk_put(clk); > - return ERR_PTR(err); > - } > - > - err = clk_enable(clk); > - if (err) { > - pr_err("smp_twd: clock failed to enable: %d\n", err); > - clk_unprepare(clk); > + pr_err("smp_twd: clock failed to prepare+enable: %d\n", err); > clk_put(clk); > return ERR_PTR(err); > } > -- > 1.7.11.7 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel Looks nice! Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index b22d700..b92d524 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -248,17 +248,9 @@ static struct clk *twd_get_clock(void) return clk; } - err = clk_prepare(clk); + err = clk_prepare_enable(clk); if (err) { - pr_err("smp_twd: clock failed to prepare: %d\n", err); - clk_put(clk); - return ERR_PTR(err); - } - - err = clk_enable(clk); - if (err) { - pr_err("smp_twd: clock failed to enable: %d\n", err); - clk_unprepare(clk); + pr_err("smp_twd: clock failed to prepare+enable: %d\n", err); clk_put(clk); return ERR_PTR(err); }
A minor code refactoring saving a few lines by merging prepare() and enable() calls. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/kernel/smp_twd.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)