Commit 6cac167b authored by Ulf Hansson's avatar Ulf Hansson Committed by Mark Brown
Browse files

spi: pl022: Simplify clock handling 



Make use of clk_prepare_enable and clk_disable_unprepare to simplify
code. No functional change.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3e7dde42

drivers/spi/spi-pl022.c

+3 −12
Original line number Diff line number Diff line
@@ -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;