diff options
Diffstat (limited to 'drivers/mmc/host/sdhci-s3c.c')
-rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 6b3f3664edeb..9a20d1f55bb7 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c | |||
@@ -619,23 +619,29 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) | |||
619 | 619 | ||
620 | #ifdef CONFIG_PM | 620 | #ifdef CONFIG_PM |
621 | 621 | ||
622 | static int sdhci_s3c_suspend(struct platform_device *dev, pm_message_t pm) | 622 | static int sdhci_s3c_suspend(struct device *dev) |
623 | { | 623 | { |
624 | struct sdhci_host *host = platform_get_drvdata(dev); | 624 | struct sdhci_host *host = dev_get_drvdata(dev); |
625 | 625 | ||
626 | return sdhci_suspend_host(host, pm); | 626 | return sdhci_suspend_host(host); |
627 | } | 627 | } |
628 | 628 | ||
629 | static int sdhci_s3c_resume(struct platform_device *dev) | 629 | static int sdhci_s3c_resume(struct device *dev) |
630 | { | 630 | { |
631 | struct sdhci_host *host = platform_get_drvdata(dev); | 631 | struct sdhci_host *host = dev_get_drvdata(dev); |
632 | 632 | ||
633 | return sdhci_resume_host(host); | 633 | return sdhci_resume_host(host); |
634 | } | 634 | } |
635 | 635 | ||
636 | static const struct dev_pm_ops sdhci_s3c_pmops = { | ||
637 | .suspend = sdhci_s3c_suspend, | ||
638 | .resume = sdhci_s3c_resume, | ||
639 | }; | ||
640 | |||
641 | #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops) | ||
642 | |||
636 | #else | 643 | #else |
637 | #define sdhci_s3c_suspend NULL | 644 | #define SDHCI_S3C_PMOPS NULL |
638 | #define sdhci_s3c_resume NULL | ||
639 | #endif | 645 | #endif |
640 | 646 | ||
641 | static struct platform_driver sdhci_s3c_driver = { | 647 | static struct platform_driver sdhci_s3c_driver = { |
@@ -644,6 +650,7 @@ static struct platform_driver sdhci_s3c_driver = { | |||
644 | .driver = { | 650 | .driver = { |
645 | .owner = THIS_MODULE, | 651 | .owner = THIS_MODULE, |
646 | .name = "s3c-sdhci", | 652 | .name = "s3c-sdhci", |
653 | .pm = SDHCI_S3C_PMOPS, | ||
647 | }, | 654 | }, |
648 | }; | 655 | }; |
649 | 656 | ||