Commit 91ca244b authored by Viresh Kumar's avatar Viresh Kumar Committed by Ulf Hansson
Browse files

mmc: sdhci-msm: Unconditionally call dev_pm_opp_of_remove_table() 



dev_pm_opp_of_remove_table() doesn't report any errors when it fails to
find the OPP table with error -ENODEV (i.e. OPP table not present for
the device). And we can call dev_pm_opp_of_remove_table()
unconditionally here.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/890ae5601594fca5de104695a682f4b6efbc631b.1599660554.git.viresh.kumar@linaro.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ce6f92c2

drivers/mmc/host/sdhci-msm.c

+5 −9
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ struct sdhci_msm_host { 
	unsigned long clk_rate;

	struct mmc_host *mmc;

	struct opp_table *opp_table;

	bool has_opp_table;

	bool use_14lpp_dll_reset;

	bool tuning_done;

	bool calibration_done;
@@ -2302,11 +2301,9 @@ static int sdhci_msm_probe(struct platform_device *pdev) 


	/* OPP table is optional */

	ret = dev_pm_opp_of_add_table(&pdev->dev);

	if (!ret) {

		msm_host->has_opp_table = true;

	} else if (ret != -ENODEV) {

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

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

		goto opp_cleanup;

		goto opp_put_clkname;

	}



	/* Vote for maximum clock rate for maximum performance */
@@ -2470,8 +2467,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks),

				   msm_host->bulk_clks);

opp_cleanup:

	if (msm_host->has_opp_table)

	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))
@@ -2491,7 +2488,6 @@ static int sdhci_msm_remove(struct platform_device *pdev) 


	sdhci_remove_host(host, dead);



	if (msm_host->has_opp_table)

	dev_pm_opp_of_remove_table(&pdev->dev);

	dev_pm_opp_put_clkname(msm_host->opp_table);

	pm_runtime_get_sync(&pdev->dev);