Commit 665ba56f authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7717/1: mmc: mmci: Use devm_clk_get API 



Converting to devm_clk_get simplifies error handling in probe
and we can remove other corresponding calls to clk_put.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c7788792

drivers/mmc/host/mmci.c

+2 −6
Original line number Diff line number Diff line
@@ -1362,16 +1362,15 @@ static int mmci_probe(struct amba_device *dev, 
	dev_dbg(mmc_dev(mmc), "designer ID = 0x%02x\n", host->hw_designer);

	dev_dbg(mmc_dev(mmc), "revision = 0x%01x\n", host->hw_revision);



	host->clk = clk_get(&dev->dev, NULL);

	host->clk = devm_clk_get(&dev->dev, NULL);

	if (IS_ERR(host->clk)) {

		ret = PTR_ERR(host->clk);

		host->clk = NULL;

		goto host_free;

	}



	ret = clk_prepare_enable(host->clk);

	if (ret)

		goto clk_free;

		goto host_free;



	host->plat = plat;

	host->variant = variant;
@@ -1576,8 +1575,6 @@ static int mmci_probe(struct amba_device *dev, 
	iounmap(host->base);

 clk_disable:

	clk_disable_unprepare(host->clk);

 clk_free:

	clk_put(host->clk);

 host_free:

	mmc_free_host(mmc);

 rel_regions:
@@ -1623,7 +1620,6 @@ static int mmci_remove(struct amba_device *dev) 


		iounmap(host->base);

		clk_disable_unprepare(host->clk);

		clk_put(host->clk);



		mmc_free_host(mmc);