summary refs log tree commit diff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-05-23 10:36:44 +0200
committerChris Ball <chris@printf.net>2014-05-23 09:16:53 -0400
commit06732b84b4cf0372f2c1db368c7b4767b020c2d1 (patch)
treed287c8f37e8411e2c8d6b8294a3833a6ab82fdf6 /drivers/mmc
parentf92603552dbf9c10c5c1d557eec80226d3effdb9 (diff)
downloadlinux-06732b84b4cf0372f2c1db368c7b4767b020c2d1.tar.gz
mmc: sdhci-of-esdhc: Fixup compile error
The commit below introduced compile errors, let's fix them.
mmc: sdhci-of-esdhc: remove platform_suspend/platform_resume callbacks

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-of-esdhc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 605815e52f5f..8be4dcfb49a0 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -306,7 +306,7 @@ static int esdhc_of_suspend(struct device *dev)
 	return sdhci_suspend_host(host);
 }
 
-static void esdhc_of_resume(device *dev)
+static int esdhc_of_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
 	int ret = sdhci_resume_host(host);
@@ -321,8 +321,8 @@ static void esdhc_of_resume(device *dev)
 }
 
 static const struct dev_pm_ops esdhc_pmops = {
-	.suspend	= esdhci_of_suspend,
-	.resume		= esdhci_of_resume,
+	.suspend	= esdhc_of_suspend,
+	.resume		= esdhc_of_resume,
 };
 #define ESDHC_PMOPS (&esdhc_pmops)
 #else