| Message ID | 1391529538-21685-10-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6cac167b826eced25a2756b996a93c6f7833c49b |
| Headers | show |
On 4 February 2014 20:19, Mark Brown <broonie@kernel.org> wrote: > On Tue, Feb 04, 2014 at 04:58:50PM +0100, Ulf Hansson wrote: >> Make use of clk_prepare_enable and clk_disable_unprepare to simplify >> code. No functional change. > > I went ahead and applied this since it looks good and seems like an > unrelated cleanup to the runtime PM stuff which seems to be where the > interdependencies are - thanks! It's on a separate branch with the > already applied change so if it does need to be cross merged we can do > that easily or even drop the branch. Thanks Mark, it seems like a good approach. Kind regards Ulf Hansson -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 2bb238f..2f44c81 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2183,13 +2183,7 @@ static int 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; @@ -2250,10 +2244,8 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) if (platform_info->enable_dma) pl022_dma_remove(pl022); err_no_irq: - clk_disable(pl022->clk); + clk_disable_unprepare(pl022->clk); err_no_clk_en: - clk_unprepare(pl022->clk); - err_clk_prep: err_no_clk: err_no_ioremap: amba_release_regions(adev); @@ -2281,8 +2273,7 @@ pl022_remove(struct amba_device *adev) if (pl022->master_info->enable_dma) pl022_dma_remove(pl022); - clk_disable(pl022->clk); - clk_unprepare(pl022->clk); + clk_disable_unprepare(pl022->clk); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); return 0;
Make use of clk_prepare_enable and clk_disable_unprepare to simplify code. No functional change. Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/spi/spi-pl022.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)