projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f926035
)
mmc: sdhci-of-esdhc: Fixup compile error
author
Ulf Hansson
<
[email protected]
>
Fri, 23 May 2014 08:36:44 +0000
(10:36 +0200)
committer
Chris Ball
<
[email protected]
>
Fri, 23 May 2014 13:16:53 +0000
(09:16 -0400)
The commit below introduced compile errors, let's fix them.
mmc: sdhci-of-esdhc: remove platform_suspend/platform_resume callbacks
Cc: Russell King <
[email protected]
>
Signed-off-by: Ulf Hansson <
[email protected]
>
Signed-off-by: Chris Ball <
[email protected]
>
drivers/mmc/host/sdhci-of-esdhc.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/host/sdhci-of-esdhc.c
b/drivers/mmc/host/sdhci-of-esdhc.c
index 605815e52f5f58b21291691eeaa8c86cf1e77183..8be4dcfb49a05f12c2f2711323e321af8f529625 100644
(file)
--- 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 = esdhc
i
_of_suspend,
- .resume = esdhc
i
_of_resume,
+ .suspend = esdhc_of_suspend,
+ .resume = esdhc_of_resume,
};
#define ESDHC_PMOPS (&esdhc_pmops)
#else