| From f14dab096174a8c2b4605d75779c2afbaf70c774 Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Thu, 26 Sep 2013 10:19:09 +0200 |
| Subject: 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> |
| (cherry picked from commit cb3ca1aed991cd67ae76aec682e63633a7bead5b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mmcif.c | 10 +++------- |
| 1 file changed, 3 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c |
| index 36629a024aa1..6bffebe6f57a 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 |
| -- |
| 1.8.5.rc3 |
| |
