I have just checked mmc-next branch. Please, don't submit this patch. Thank you. > -----Original Message----- > Subject: [PATCH] mmc: sdhci-s3c: use dev_pm_ops > > Instead of using legacy suspend/resume methods, using newer dev_pm_ops > structure allows better control over power management. > > Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> > --- > drivers/mmc/host/sdhci-s3c.c | 19 +++++++++++++------ > 1 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index cb60c41..5272c74 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -621,17 +621,18 @@ 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 platform_device *pdev = to_platform_device(dev); > + struct sdhci_host *host = platform_get_drvdata(pdev); > > - return sdhci_suspend_host(host, pm); > + return sdhci_suspend_host(host, PMSG_SUSPEND); > } > > -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 platform_device *pdev = to_platform_device(dev); > + struct sdhci_host *host = platform_get_drvdata(pdev); > > return sdhci_resume_host(host); > } > @@ -641,12 +642,18 @@ static int sdhci_s3c_resume(struct platform_device *dev) > #define sdhci_s3c_resume NULL > #endif > > +static const struct dev_pm_ops sdhci_s3c_pm_ops = { > + .suspend = sdhci_s3c_suspend, > + .resume = sdhci_s3c_resume, > +}; > + > static struct platform_driver sdhci_s3c_driver = { > .probe = sdhci_s3c_probe, > .remove = __devexit_p(sdhci_s3c_remove), > .driver = { > .owner = THIS_MODULE, > .name = "s3c-sdhci", > + .pm = &sdhci_s3c_pm_ops, > }, > }; > > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html