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

Commit 1e674bc6 authored by Prashant Gaikwad's avatar Prashant Gaikwad Committed by Stephen Warren
Browse files

mmc: tegra: add clk_prepare/clk_unprepare 



Use clk_prepare/clk_unprepare as required by the generic clk framework.

Cc: cjb@laptop.org
Cc: linux-mmc@vger.kernel.org
Signed-off-by: default avatarPrashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 6f786aad

drivers/mmc/host/sdhci-tegra.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) 
		rc = PTR_ERR(clk);

		rc = PTR_ERR(clk);

		goto err_clk_get;

		goto err_clk_get;

	}

	}

	clk_enable(clk);

	clk_prepare_enable(clk);

	pltfm_host->clk = clk;

	pltfm_host->clk = clk;





	host->mmc->pm_caps = plat->pm_flags;

	host->mmc->pm_caps = plat->pm_flags;
@@ -349,7 +349,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) 
	return 0;

	return 0;





err_add_host:

err_add_host:

	clk_disable(pltfm_host->clk);

	clk_disable_unprepare(pltfm_host->clk);

	clk_put(pltfm_host->clk);

	clk_put(pltfm_host->clk);

err_clk_get:

err_clk_get:

	if (gpio_is_valid(plat->wp_gpio))

	if (gpio_is_valid(plat->wp_gpio))
@@ -390,7 +390,7 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev) 
	if (gpio_is_valid(plat->power_gpio))

	if (gpio_is_valid(plat->power_gpio))

		gpio_free(plat->power_gpio);

		gpio_free(plat->power_gpio);





	clk_disable(pltfm_host->clk);

	clk_disable_unprepare(pltfm_host->clk);

	clk_put(pltfm_host->clk);

	clk_put(pltfm_host->clk);





	sdhci_pltfm_free(pdev);

	sdhci_pltfm_free(pdev);