Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7430e77e authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci-dove: use devm_clk_get() 



Use devm_clk_get() rather than clk_get() to make cleanup paths more simple.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent a4071fbb

drivers/mmc/host/sdhci-dove.c

+4 −7
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



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

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

	if (!IS_ERR(priv->clk))

		clk_prepare_enable(priv->clk);
@@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) 
	return 0;



sdhci_dove_register_fail:

	if (!IS_ERR(priv->clk)) {

	if (!IS_ERR(priv->clk))

		clk_disable_unprepare(priv->clk);

		clk_put(priv->clk);

	}

	return ret;

}
@@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev) 


	sdhci_pltfm_unregister(pdev);



	if (!IS_ERR(priv->clk)) {

	if (!IS_ERR(priv->clk))

		clk_disable_unprepare(priv->clk);

		clk_put(priv->clk);

	}



	return 0;

}