xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: sdhci: remove "state" argument from sdhci_suspend_host

Browse Source 
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>
This commit is contained in:
Manuel Lauss
2011-11-03 11:09:45 +01:00
committed by Chris Ball
parent 49df780749
commit 29495aa04a
14 changed files with 52 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mmc/host/sdhci-s3c.c
View File

@@ -622,23 +622,29 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int sdhci_s3c_suspend(struct platform_device *dev, pm_message_t pm)
static int sdhci_s3c_suspend(struct device *dev)
{
struct sdhci_host *host = platform_get_drvdata(dev);
struct sdhci_host *host = dev_get_drvdata(dev);
return sdhci_suspend_host(host, pm);
return sdhci_suspend_host(host);
}
static int sdhci_s3c_resume(struct platform_device *dev)
static int sdhci_s3c_resume(struct device *dev)
{
struct sdhci_host *host = platform_get_drvdata(dev);
struct sdhci_host *host = dev_get_drvdata(dev);
return sdhci_resume_host(host);
}
static const struct dev_pm_ops sdhci_s3c_pmops = {
.suspend = sdhci_s3c_suspend,
.resume = sdhci_s3c_resume,
};
#define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops)
#else
#define sdhci_s3c_suspend NULL
#define sdhci_s3c_resume NULL
#define SDHCI_S3C_PMOPS NULL
#endif
static struct platform_driver sdhci_s3c_driver = {
@@ -647,6 +653,7 @@ static struct platform_driver sdhci_s3c_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "s3c-sdhci",
.pm = SDHCI_S3C_PMOPS,
},
};