summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-of-hlwd.c
diff options
context:
space:
mode:
authorManuel Lauss2011-11-03 11:09:45 +0100
committerChris Ball2011-12-20 00:50:11 +0100
commit29495aa04a30c21565243c5b9c028510446d242c (patch)
tree7f9bd3ab43cd4494c9fc4a92956c414ccbe85a0f /drivers/mmc/host/sdhci-of-hlwd.c
parentmmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined (diff)
downloadkernel-qcow2-linux-29495aa04a30c21565243c5b9c028510446d242c.tar.gz
kernel-qcow2-linux-29495aa04a30c21565243c5b9c028510446d242c.tar.xz
kernel-qcow2-linux-29495aa04a30c21565243c5b9c028510446d242c.zip
mmc: sdhci: remove "state" argument from sdhci_suspend_host
Drop the "state" argument from sdhci_suspend_host. Its only user is the PCI glue; this allows to move all SDHCI glues to use dev_pm_ops instead. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-of-hlwd.c')
-rw-r--r--drivers/mmc/host/sdhci-of-hlwd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-of-hlwd.c b/drivers/mmc/host/sdhci-of-hlwd.c
index 9b0d794a4f69..3619adc7d9fc 100644
--- a/drivers/mmc/host/sdhci-of-hlwd.c
+++ b/drivers/mmc/host/sdhci-of-hlwd.c
@@ -87,13 +87,10 @@ static struct platform_driver sdhci_hlwd_driver = {
.name = "sdhci-hlwd",
.owner = THIS_MODULE,
.of_match_table = sdhci_hlwd_of_match,
+ .pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_hlwd_probe,
.remove = __devexit_p(sdhci_hlwd_remove),
-#ifdef CONFIG_PM
- .suspend = sdhci_pltfm_suspend,
- .resume = sdhci_pltfm_resume,
-#endif
};
static int __init sdhci_hlwd_init(void)