dect
/
linux-2.6
Archived
13
0
Fork 0

ARM: 7561/1: SMP_TWD: use clk_prepare_enable()

A minor code refactoring saving a few lines by merging prepare()
and enable() calls.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Linus Walleij 2012-10-22 10:18:06 +01:00 committed by Russell King
parent 871df85a59
commit 2577cf2462
1 changed files with 2 additions and 10 deletions

View File

@ -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);
}