diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-26 10:19:09 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:28:34 -0400 |
| commit | cb3ca1aed991cd67ae76aec682e63633a7bead5b (patch) | |
| tree | 64f45d1b6073632cc066801a080f72b473b92f81 /drivers/mmc/host/sh_mmcif.c | |
| parent | b2822d372560dfffd730b974b73d77b210a71ffa (diff) | |
| download | op-kernel-dev-cb3ca1aed991cd67ae76aec682e63633a7bead5b.zip op-kernel-dev-cb3ca1aed991cd67ae76aec682e63633a7bead5b.tar.gz | |
mmc: sh_mmcif: 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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sh_mmcif.c')
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 36629a0..6bffebe 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1542,19 +1542,15 @@ static int sh_mmcif_remove(struct platform_device *pdev) static int sh_mmcif_suspend(struct device *dev) { struct sh_mmcif_host *host = dev_get_drvdata(dev); - int ret = mmc_suspend_host(host->mmc); - if (!ret) - sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); + sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); - return ret; + return 0; } static int sh_mmcif_resume(struct device *dev) { - struct sh_mmcif_host *host = dev_get_drvdata(dev); - - return mmc_resume_host(host->mmc); + return 0; } #else #define sh_mmcif_suspend NULL |
