| Message ID | 1400834204-1933-1-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi, On Fri, May 23 2014, Ulf Hansson wrote: > 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> Thanks, pushed to mmc-next. - Chris.
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 605815e..8be4dcf 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
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> --- drivers/mmc/host/sdhci-of-esdhc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)