evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: 7915/1: amba: Convert to clk_prepare_enable and clk_disable_unprepare

Browse source 
To simplify code and error handling let's use clk_prepare_enable
and clk_disable_unprepare. No functional change.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ulf Hansson 2013-12-09 10:39:13 +01:00 • committed by Russell King
parent 26825cfd90
commit 89a5c985f8
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/amba/bus.c
View file

@ -151,36 +151,23 @@ postcore_initcall(amba_init);
static int amba_get_enable_pclk(struct amba_device *pcdev) static int amba_get_enable_pclk(struct amba_device *pcdev)
{ {
struct clk *pclk = clk_get(&pcdev->dev, "apb_pclk");
int ret; int ret;
pcdev->pclk = pclk; pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk");
if (IS_ERR(pcdev->pclk))
return PTR_ERR(pcdev->pclk);
if (IS_ERR(pclk)) ret = clk_prepare_enable(pcdev->pclk);
return PTR_ERR(pclk); if (ret)
clk_put(pcdev->pclk);
ret = clk_prepare(pclk);
if (ret) {
clk_put(pclk);
return ret;
}
ret = clk_enable(pclk);
if (ret) {
clk_unprepare(pclk);
clk_put(pclk);
}
return ret; return ret;
} }
static void amba_put_disable_pclk(struct amba_device *pcdev) static void amba_put_disable_pclk(struct amba_device *pcdev)
{ {
struct clk *pclk = pcdev->pclk; clk_disable_unprepare(pcdev->pclk);
clk_put(pcdev->pclk);
clk_disable(pclk);
clk_unprepare(pclk);
clk_put(pclk);
} }
/* /*