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/spi/spi-orion.c | 3 +-- drivers/spi/spi-pl022.c | 17 ++++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index b17c09c..b2a7199 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -416,8 +416,7 @@ static int __init orion_spi_probe(struct platform_device *pdev) goto out; } - clk_prepare(spi->clk); - clk_enable(spi->clk); + clk_prepare_enable(spi->clk); tclk_hz = clk_get_rate(spi->clk); spi->max_speed = DIV_ROUND_UP(tclk_hz, 4); spi->min_speed = DIV_ROUND_UP(tclk_hz, 30); diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index b0fec03..0d235d4 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2142,16 +2142,10 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) goto err_no_clk; } - status = clk_prepare(pl022->clk); - if (status) { - dev_err(&adev->dev, "could not prepare SSP/SPI bus clock\n"); - goto err_clk_prep; - } - - status = clk_enable(pl022->clk); + status = clk_prepare_enable(pl022->clk); if (status) { dev_err(&adev->dev, "could not enable SSP/SPI bus clock\n"); - goto err_no_clk_en; + goto err_clk_prep; } /* Initialize transfer pump */ @@ -2207,9 +2201,7 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) free_irq(adev->irq[0], pl022); err_no_irq: - clk_disable(pl022->clk); - err_no_clk_en: - clk_unprepare(pl022->clk); + clk_disable_unprepare(pl022->clk); err_clk_prep: clk_put(pl022->clk); err_no_clk: @@ -2243,8 +2235,7 @@ pl022_remove(struct amba_device *adev) pl022_dma_remove(pl022); free_irq(adev->irq[0], pl022); - clk_disable(pl022->clk); - clk_unprepare(pl022->clk); + clk_disable_unprepare(pl022->clk); clk_put(pl022->clk); pm_runtime_disable(&adev->dev); iounmap(pl022->virtbase); -- 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
