diff options
Diffstat (limited to 'drivers/mmc/host/sdhci-s3c.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 23 | 
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 3d00e722efc..0d33ff0d67f 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -622,33 +622,38 @@ 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 = {  	.probe		= sdhci_s3c_probe,  	.remove		= __devexit_p(sdhci_s3c_remove), -	.suspend	= sdhci_s3c_suspend, -	.resume	        = sdhci_s3c_resume,  	.driver		= {  		.owner	= THIS_MODULE,  		.name	= "s3c-sdhci", +		.pm	= SDHCI_S3C_PMOPS,  	},  };  |