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/i2c/busses/i2c-sirf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c index 5574a47..110660a 100644 --- a/drivers/i2c/busses/i2c-sirf.c +++ b/drivers/i2c/busses/i2c-sirf.c @@ -278,18 +278,12 @@ static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev) goto err_get_clk; } - err = clk_prepare(clk); + err = clk_prepare_enable(clk); if (err) { - dev_err(&pdev->dev, "Clock prepare failed\n"); + dev_err(&pdev->dev, "Clock prepare or enable failed\n"); goto err_clk_prep; } - err = clk_enable(clk); - if (err) { - dev_err(&pdev->dev, "Clock enable failed\n"); - goto err_clk_en; - } - ctrl_speed = clk_get_rate(clk); siic = devm_kzalloc(&pdev->dev, sizeof(*siic), GFP_KERNEL); @@ -376,9 +370,7 @@ static int __devinit i2c_sirfsoc_probe(struct platform_device *pdev) return 0; out: - clk_disable(clk); -err_clk_en: - clk_unprepare(clk); + clk_disable_unprepare(clk); err_clk_prep: clk_put(clk); err_get_clk: -- 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
