* [PATCH] mmc: sdhci-of-esdhc: Fixup compile error
@ 2014-05-23 8:36 Ulf Hansson
2014-05-23 13:18 ` Chris Ball
0 siblings, 1 reply; 2+ messages in thread
From: Ulf Hansson @ 2014-05-23 8:36 UTC (permalink / raw)
To: linux-mmc, Chris Ball; +Cc: Ulf Hansson, Russell King
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(-)
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: sdhci-of-esdhc: Fixup compile error
2014-05-23 8:36 [PATCH] mmc: sdhci-of-esdhc: Fixup compile error Ulf Hansson
@ 2014-05-23 13:18 ` Chris Ball
0 siblings, 0 replies; 2+ messages in thread
From: Chris Ball @ 2014-05-23 13:18 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-mmc, Russell King
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.
--
Chris Ball <http://printf.net/>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-23 13:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-23 8:36 [PATCH] mmc: sdhci-of-esdhc: Fixup compile error Ulf Hansson
2014-05-23 13:18 ` Chris Ball
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.