diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-25 09:33:01 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:28:26 -0400 |
commit | bd190f90b5fb75a8421ccfecd2ee6c82605f7620 (patch) | |
tree | 4d9a7f6b3da3b23bd568a5bb67d9185540cf593f /drivers/mmc/host/mxcmmc.c | |
parent | 683590791dedcae4170cb0fd4b05241098d27b54 (diff) |
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>
Diffstat (limited to 'drivers/mmc/host/mxcmmc.c')
-rw-r--r-- | drivers/mmc/host/mxcmmc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index c174c6a0d224..f7199c83f5cf 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -1250,28 +1250,20 @@ static int mxcmci_suspend(struct device *dev) | |||
1250 | { | 1250 | { |
1251 | struct mmc_host *mmc = dev_get_drvdata(dev); | 1251 | struct mmc_host *mmc = dev_get_drvdata(dev); |
1252 | struct mxcmci_host *host = mmc_priv(mmc); | 1252 | struct mxcmci_host *host = mmc_priv(mmc); |
1253 | int ret = 0; | ||
1254 | 1253 | ||
1255 | if (mmc) | ||
1256 | ret = mmc_suspend_host(mmc); | ||
1257 | clk_disable_unprepare(host->clk_per); | 1254 | clk_disable_unprepare(host->clk_per); |
1258 | clk_disable_unprepare(host->clk_ipg); | 1255 | clk_disable_unprepare(host->clk_ipg); |
1259 | 1256 | return 0; | |
1260 | return ret; | ||
1261 | } | 1257 | } |
1262 | 1258 | ||
1263 | static int mxcmci_resume(struct device *dev) | 1259 | static int mxcmci_resume(struct device *dev) |
1264 | { | 1260 | { |
1265 | struct mmc_host *mmc = dev_get_drvdata(dev); | 1261 | struct mmc_host *mmc = dev_get_drvdata(dev); |
1266 | struct mxcmci_host *host = mmc_priv(mmc); | 1262 | struct mxcmci_host *host = mmc_priv(mmc); |
1267 | int ret = 0; | ||
1268 | 1263 | ||
1269 | clk_prepare_enable(host->clk_per); | 1264 | clk_prepare_enable(host->clk_per); |
1270 | clk_prepare_enable(host->clk_ipg); | 1265 | clk_prepare_enable(host->clk_ipg); |
1271 | if (mmc) | 1266 | return 0; |
1272 | ret = mmc_resume_host(mmc); | ||
1273 | |||
1274 | return ret; | ||
1275 | } | 1267 | } |
1276 | 1268 | ||
1277 | static const struct dev_pm_ops mxcmci_pm_ops = { | 1269 | static const struct dev_pm_ops mxcmci_pm_ops = { |