| From 9177c23cb80dd6f507a0b73e3f5f1141e7892b5e Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Thu, 26 Sep 2013 10:36:06 +0200 |
| Subject: mmc: tmio: 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> |
| Cc: Ian Molton <ian@mnementh.co.uk> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit d62c9577f950b1ce9b53200542c251ba8dfff344) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 9 +++------ |
| 1 file changed, 3 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index b3802256f954..f3b2d8ca1eca 100644 |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -1145,12 +1145,9 @@ int tmio_mmc_host_suspend(struct device *dev) |
| { |
| struct mmc_host *mmc = dev_get_drvdata(dev); |
| struct tmio_mmc_host *host = mmc_priv(mmc); |
| - int ret = mmc_suspend_host(mmc); |
| |
| - if (!ret) |
| - tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL); |
| - |
| - return ret; |
| + tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL); |
| + return 0; |
| } |
| EXPORT_SYMBOL(tmio_mmc_host_suspend); |
| |
| @@ -1163,7 +1160,7 @@ int tmio_mmc_host_resume(struct device *dev) |
| |
| /* The MMC core will perform the complete set up */ |
| host->resuming = true; |
| - return mmc_resume_host(mmc); |
| + return 0; |
| } |
| EXPORT_SYMBOL(tmio_mmc_host_resume); |
| |
| -- |
| 1.8.5.rc3 |
| |
