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

Commit 7af37663 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: wmt-sdmmc: Move away from using deprecated APIs 



Suspend and resume of cards are being handled from the protocol layer
and consequently the mmc_suspend|resume_host APIs are deprecated.

This means we can simplify the suspend|resume callbacks by removing the
use of the deprecated APIs.

Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent bd190f90

drivers/mmc/host/wmt-sdmmc.c

+10 −17
Original line number Diff line number Diff line
@@ -925,15 +925,11 @@ static int wmt_mci_suspend(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct mmc_host *mmc = platform_get_drvdata(pdev);

	struct wmt_mci_priv *priv;

	int ret;



	if (!mmc)

		return 0;



	priv = mmc_priv(mmc);

	ret = mmc_suspend_host(mmc);



	if (!ret) {

	reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);

	writeb(reg_tmp | BM_SOFT_RESET, priv->sdmmc_base +

	       SDMMC_BUSMODE);
@@ -945,8 +941,7 @@ static int wmt_mci_suspend(struct device *dev) 
	writeb(0xFF, priv->sdmmc_base + SDMMC_STS1);



	clk_disable(priv->clk_sdmmc);

	}

	return ret;

	return 0;

}



static int wmt_mci_resume(struct device *dev)
@@ -955,7 +950,6 @@ static int wmt_mci_resume(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct mmc_host *mmc = platform_get_drvdata(pdev);

	struct wmt_mci_priv *priv;

	int ret = 0;



	if (mmc) {

		priv = mmc_priv(mmc);
@@ -973,10 +967,9 @@ static int wmt_mci_resume(struct device *dev) 
		writeb(reg_tmp | INT0_DI_INT_EN, priv->sdmmc_base +

		       SDMMC_INTMASK0);



		ret = mmc_resume_host(mmc);

	}



	return ret;

	return 0;

}



static const struct dev_pm_ops wmt_mci_pm = {