aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/davinci_mmc.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2010-05-26 17:42:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 12:12:40 -0400
commit1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e (patch)
tree3b4239740ca22d19780d05da92cdd203828ea17f /drivers/mmc/host/davinci_mmc.c
parenta791daa15305e7e549a418ef0ae6bc4b4580066e (diff)
mmc: remove the "state" argument to mmc_suspend_host()
Even though many mmc host drivers pass a pm_message_t argument to mmc_suspend_host() that argument isn't used the by MMC core. As host drivers are converted to dev_pm_ops they'll have to construct pm_message_t's (as they won't be passed by the PM subsystem any more) just to appease the mmc suspend interface. We might as well just delete the unused paramter. Signed-off-by: Matt Fleming <matt@console-pimps.org> Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Acked-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>ZZ Acked-by: Sascha Sommer <saschasommer@freenet.de> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mmc/host/davinci_mmc.c')
-rw-r--r--drivers/mmc/host/davinci_mmc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index aae39125b8d7..33d9f1b00862 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1337,11 +1337,10 @@ static int davinci_mmcsd_suspend(struct device *dev)
1337{ 1337{
1338 struct platform_device *pdev = to_platform_device(dev); 1338 struct platform_device *pdev = to_platform_device(dev);
1339 struct mmc_davinci_host *host = platform_get_drvdata(pdev); 1339 struct mmc_davinci_host *host = platform_get_drvdata(pdev);
1340 struct pm_message msg = { PM_EVENT_SUSPEND };
1341 int ret; 1340 int ret;
1342 1341
1343 mmc_host_enable(host->mmc); 1342 mmc_host_enable(host->mmc);
1344 ret = mmc_suspend_host(host->mmc, msg); 1343 ret = mmc_suspend_host(host->mmc);
1345 if (!ret) { 1344 if (!ret) {
1346 writel(0, host->base + DAVINCI_MMCIM); 1345 writel(0, host->base + DAVINCI_MMCIM);
1347 mmc_davinci_reset_ctrl(host, 1); 1346 mmc_davinci_reset_ctrl(host, 1);