Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: mxcmmc: 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: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by

Ulf Hansson and committed by
Chris Ball
bd190f90 68359079

+2 -10
+2 -10
drivers/mmc/host/mxcmmc.c
··· 1250 1250 { 1251 1251 struct mmc_host *mmc = dev_get_drvdata(dev); 1252 1252 struct mxcmci_host *host = mmc_priv(mmc); 1253 - int ret = 0; 1254 1253 1255 - if (mmc) 1256 - ret = mmc_suspend_host(mmc); 1257 1254 clk_disable_unprepare(host->clk_per); 1258 1255 clk_disable_unprepare(host->clk_ipg); 1259 - 1260 - return ret; 1256 + return 0; 1261 1257 } 1262 1258 1263 1259 static int mxcmci_resume(struct device *dev) 1264 1260 { 1265 1261 struct mmc_host *mmc = dev_get_drvdata(dev); 1266 1262 struct mxcmci_host *host = mmc_priv(mmc); 1267 - int ret = 0; 1268 1263 1269 1264 clk_prepare_enable(host->clk_per); 1270 1265 clk_prepare_enable(host->clk_ipg); 1271 - if (mmc) 1272 - ret = mmc_resume_host(mmc); 1273 - 1274 - return ret; 1266 + return 0; 1275 1267 } 1276 1268 1277 1269 static const struct dev_pm_ops mxcmci_pm_ops = {