Commit 411281d2 authored by Yangtao Li's avatar Yangtao Li Committed by Viresh Kumar
Browse files

mmc: sdhci-msm: Convert to use resource-managed OPP API 



Use resource-managed OPP API to simplify code.

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 6504dcae

drivers/mmc/host/sdhci-msm.c

+5 −14
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ struct sdhci_msm_host { 
	struct clk_bulk_data bulk_clks[5];

	unsigned long clk_rate;

	struct mmc_host *mmc;

	struct opp_table *opp_table;

	bool use_14lpp_dll_reset;

	bool tuning_done;

	bool calibration_done;
@@ -2551,17 +2550,15 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	if (ret)

		goto bus_clk_disable;



	msm_host->opp_table = dev_pm_opp_set_clkname(&pdev->dev, "core");

	if (IS_ERR(msm_host->opp_table)) {

		ret = PTR_ERR(msm_host->opp_table);

	ret = devm_pm_opp_set_clkname(&pdev->dev, "core");

	if (ret)

		goto bus_clk_disable;

	}



	/* OPP table is optional */

	ret = dev_pm_opp_of_add_table(&pdev->dev);

	ret = devm_pm_opp_of_add_table(&pdev->dev);

	if (ret && ret != -ENODEV) {

		dev_err(&pdev->dev, "Invalid OPP table in Device tree\n");

		goto opp_put_clkname;

		goto bus_clk_disable;

	}



	/* Vote for maximum clock rate for maximum performance */
@@ -2587,7 +2584,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks),

				      msm_host->bulk_clks);

	if (ret)

		goto opp_cleanup;

		goto bus_clk_disable;



	/*

	 * xo clock is needed for FLL feature of cm_dll.
@@ -2732,10 +2729,6 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
clk_disable:

	clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks),

				   msm_host->bulk_clks);

opp_cleanup:

	dev_pm_opp_of_remove_table(&pdev->dev);

opp_put_clkname:

	dev_pm_opp_put_clkname(msm_host->opp_table);

bus_clk_disable:

	if (!IS_ERR(msm_host->bus_clk))

		clk_disable_unprepare(msm_host->bus_clk);
@@ -2754,8 +2747,6 @@ static int sdhci_msm_remove(struct platform_device *pdev) 


	sdhci_remove_host(host, dead);



	dev_pm_opp_of_remove_table(&pdev->dev);

	dev_pm_opp_put_clkname(msm_host->opp_table);

	pm_runtime_get_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);