From: Julia Lawall <Julia.Lawall@xxxxxxx> Clk_prepare_enable and clk_disable_unprepare combine clk_prepare and clk_enable, and clk_disable and clk_unprepare. They make the code more concise, and ensure that clk_unprepare is called when clk_enable fails. A simplified version of the semantic patch that introduces calls to these functions is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e; @@ - clk_prepare(e); - clk_enable(e); + clk_prepare_enable(e); @@ expression e; @@ - clk_disable(e); - clk_unprepare(e); + clk_disable_unprepare(e); // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> --- drivers/amba/bus.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index e8eb91b..6374ee6 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -329,17 +329,9 @@ static int amba_get_enable_pclk(struct amba_device *pcdev) if (IS_ERR(pclk)) return PTR_ERR(pclk); - ret = clk_prepare(pclk); - if (ret) { - clk_put(pclk); - return ret; - } - - ret = clk_enable(pclk); - if (ret) { - clk_unprepare(pclk); + ret = clk_prepare_enable(pclk); + if (ret) clk_put(pclk); - } return ret; } @@ -348,8 +340,7 @@ static void amba_put_disable_pclk(struct amba_device *pcdev) { struct clk *pclk = pcdev->pclk; - clk_disable(pclk); - clk_unprepare(pclk); + clk_disable_unprepare(pclk); clk_put(pclk); } -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
