diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-23 04:36:44 -0400 |
---|---|---|
committer | Chris Ball <chris@printf.net> | 2014-05-23 09:16:53 -0400 |
commit | 06732b84b4cf0372f2c1db368c7b4767b020c2d1 (patch) | |
tree | d287c8f37e8411e2c8d6b8294a3833a6ab82fdf6 /drivers | |
parent | f92603552dbf9c10c5c1d557eec80226d3effdb9 (diff) |
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')
-rw-r--r-- | drivers/mmc/host/sdhci-of-esdhc.c | 6 |
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) | |||
306 | return sdhci_suspend_host(host); | 306 | return sdhci_suspend_host(host); |
307 | } | 307 | } |
308 | 308 | ||
309 | static void esdhc_of_resume(device *dev) | 309 | static int esdhc_of_resume(struct device *dev) |
310 | { | 310 | { |
311 | struct sdhci_host *host = dev_get_drvdata(dev); | 311 | struct sdhci_host *host = dev_get_drvdata(dev); |
312 | int ret = sdhci_resume_host(host); | 312 | int ret = sdhci_resume_host(host); |
@@ -321,8 +321,8 @@ static void esdhc_of_resume(device *dev) | |||
321 | } | 321 | } |
322 | 322 | ||
323 | static const struct dev_pm_ops esdhc_pmops = { | 323 | static const struct dev_pm_ops esdhc_pmops = { |
324 | .suspend = esdhci_of_suspend, | 324 | .suspend = esdhc_of_suspend, |
325 | .resume = esdhci_of_resume, | 325 | .resume = esdhc_of_resume, |
326 | }; | 326 | }; |
327 | #define ESDHC_PMOPS (&esdhc_pmops) | 327 | #define ESDHC_PMOPS (&esdhc_pmops) |
328 | #else | 328 | #else |